Roberto Rosario
3b03af9295
Merge branch 'feature/lts' into merge_test
Conflicts:
mayan/apps/documents/api_views.py
mayan/apps/documents/models.py
mayan/apps/folders/__init__.py
mayan/apps/folders/urls.py
mayan/apps/folders/views.py
mayan/apps/tags/urls.py
mayan/apps/tags/views.py
mayan/settings/base.py
2014-10-03 11:41:41 -04:00
..
2014-10-03 11:41:41 -04:00
2014-07-11 03:34:28 -04:00
2014-07-11 01:06:50 -04:00
2014-10-03 11:41:41 -04:00
2014-08-26 23:00:35 -04:00
2014-10-03 01:55:33 -04:00
2014-10-01 22:53:48 -04:00
2014-08-18 01:29:23 -04:00