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

Merge branch 'hotfix/v0.10-hf1' into development

Browse Source 
Conflicts:
	apps/main/__init__.py
	docs/changelog.rst
This commit is contained in:
Roberto Rosario
2011-12-05 14:46:17 -04:00
parent 1a973723f2 52a8fca5d9
commit 623fa8276f
5 changed files with 16 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
requirements/development.txt
+1 -1
View File
@@ -16,7 +16,7 @@ pdfminer==20110227
APScheduler==2.0.2
Pillow==1.7.4
cssmin==0.1.4
django-compressor==1.1
django-compressor==1.1.1
-e git://github.com/rosarior/django-sendfile.git#egg=django-sendfile
djangorestframework==0.2.3
South==0.7.3
requirements/production.txt
+1 -1
View File
@@ -13,7 +13,7 @@ pdfminer==20110227
APScheduler==2.0.2
Pillow==1.7.4
cssmin==0.1.4
django-compressor==1.1
django-compressor==1.1.1
-e git://github.com/rosarior/django-sendfile.git#egg=django-sendfile
djangorestframework==0.2.3
South==0.7.3