matthias/mayan-edms
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
2,892 Commits 36 Branches 0 Tags
3d033c687d9a7cb16f76c2ab976e3cd5661d325d
Commit Graph

1 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