Commit Graph
2 Commits
Author SHA1 Message Date
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
Roberto Rosario 07cc6301ae Update requirements file, add testing requirements file 2014-05-19 20:53:26 -04:00