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

Merge branch 'hotfix/v0.12.2' into development

Browse Source 
Conflicts:
	apps/common/__init__.py
	apps/documents/forms.py
	apps/feedback/__init__.py
	apps/history/__init__.py
	apps/main/__init__.py
	apps/scheduler/api.py
	apps/sources/models.py
	docs/releases/index.rst
	requirements/production.txt
	settings.py
	urls.py
This commit is contained in:
Roberto Rosario
2012-06-30 04:00:01 -04:00
parent 90c411f554 04de24ea51
commit 080d68c169
438 changed files with 12762 additions and 4473 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
requirements/production.txt
View File

@@ -58,4 +58,15 @@ requests==0.13.1
-e git+https://github.com/toastdriven/django-haystack.git@c6fd81d4163eb816476a853d416b68757e0c7ca4#egg=django_haystack-dev
Whoosh==2.3.2
Unidecode==0.04.9
# Navigation
pbs==0.105
# Installation
psutil==0.5.0
# Misc
elementtree==1.2.7-20070827-preview