matthias/mayan-edms
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into merge_master

Browse Source 
Signed-off-by: Roberto Rosario <roberto.rosario.gonzalez@gmail.com>
This commit is contained in:
Roberto Rosario
2017-06-07 13:56:35 -04:00
parent 93aeb8cffe ca12bdcced
commit ca1f674d78
1405 changed files with 15507 additions and 14544 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
setup.py
View File

@@ -60,7 +60,7 @@ Pillow==4.1.1
PyYAML==3.12
celery==3.1.24
cssmin==0.2.0
Django==1.10.6
Django==1.10.7
django-activity-stream==0.6.3
django-autoadmin==1.1.1
django-celery==3.2.1