Roberto Rosario 600ba153af Merge branch 'feature/document_signature_app' into feature/ACL_support_w_permission_refactor ...

Conflicts:
	apps/django_gpg/__init__.py
	apps/django_gpg/views.py
	apps/tags/__init__.py

2012-01-01 20:50:28 -04:00

12 KiB

Raw Blame History

View Raw