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

..

common.txt

Remove common app's Singleton model and use django-solo's SingletonModel instead

2014-07-10 01:26:51 -04:00

development.txt

Reconfigured settings to support mayan/apps and separate production and development.

2014-07-10 07:29:38 +10:00

testing.txt

Update requirements file, add testing requirements file

2014-05-19 20:53:26 -04:00