Roberto Rosario cac87d1d37 Merge branch 'master' of https://github.com/cccs-web/mayan-edms into cccs-web-master ...

Conflicts:
	docs/credits/contributors.rst

2014-07-11 18:35:45 -04:00

..

contributors.rst

Merge branch 'master' of https://github.com/cccs-web/mayan-edms into cccs-web-master

2014-07-11 18:35:45 -04:00

index.rst

Documentation updates

2014-07-10 04:19:59 -04:00

license.rst

Update documentation license link

2014-06-30 01:27:01 -04:00