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

..

apache

Fixed the apache contrib file static file directory name

2011-09-13 20:49:06 -04:00

gunicorn

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

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

nginx

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

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

sample_documents

Add OCR test

2014-07-01 00:45:42 -04:00

scripts

Add the statistics app to the translations helper script

2014-07-04 01:47:40 -04:00

supervisor

Remove Sentry and celery from Mayan EDMS

2012-01-23 20:00:39 -04:00

upstart

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

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