Roberto Rosario 972aa02976 Merge branch 'master' of https://github.com/cccs-web/mayan-edms into cccs-web-master ...

Conflicts:
	mayan/settings/includes/common.py

2014-07-11 00:32:50 -04:00

..

nginx.conf

Merge branch 'master' of https://github.com/cccs-web/mayan-edms into cccs-web-master

2014-07-11 00:32:50 -04:00