Commit Graph

3 Commits

Author SHA1 Message Date
Mathias Behrle
29b5f36605 Adding sample ini file for nginx with uwsgi. 2014-09-13 21:00:31 +02:00
Roberto Rosario
397b083381 Add contrib files 2014-08-18 01:29:50 -04:00
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