Commit Graph

2 Commits

Author SHA1 Message Date
Roberto Rosario
f2c351fbc7 Remove the SITE_ROOT settings variable and use Django's MEDIA_ROOT instead.
By default MEDIA_ROOT will point to a new 'media' inside Mayan's main directory.
2014-07-11 01:06: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