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

..

apps

Merge pull request #13 from mbehrle/feature/lost_merges

2014-07-10 20:42:02 -04:00

bin

PEP8 cleanup, unused imports, missing imports, style cleanups

2014-07-10 02:45:19 -04:00

settings

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

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

__init__.py

Update documentation

2014-06-29 16:23:18 -04:00

urls.py

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

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

wsgi.py

Fix wsgi.py comment typo

2014-06-20 17:34:05 -04:00