2 Commits

Include renames

Author	SHA1	Message	Date
Roberto Rosario	78ecee7266	Merge branch 'gwalborn-master' into test ... Conflicts: mayan/apps/metadata/forms.py	2014-10-07 13:47:02 -04:00
Roberto Rosario	b761037d99	Move all settings files from <app>/conf/settings.py to <app>/settings.py	2014-09-11 05:02:40 -04:00