5083095
Merge branch 'develop' into master for 0.4.4 release
Merged and Committed by 
tflink
9 years ago
alembic/versions/4df932caa9a9_add_needinfo_request.py
file modified
+1
-1
blockerbugs.spec
file modified
+13
-6
blockerbugs/__init__.py
file modified
+1
-1
blockerbugs/controllers/admin/__init__.py
file modified
+3
-3
blockerbugs/controllers/admin/build.py
file modified
+6
-5
blockerbugs/controllers/admin/spin.py
file modified
+3
-3
blockerbugs/controllers/forms.py
file modified
+0
-1
blockerbugs/controllers/users.py
file modified
+13
-11
blockerbugs/templates/admin/edit_userinfo.html
file modified
+1
-1
blockerbugs/util/login.py
file modified
+2
-2
conf/blockerbugs.conf
file modified
+8
-2
docs/source/conf.py
file modified
+2
-2
init_db.sh
file modified
+4
-4
requirements.txt
file modified
+22
-24
setup.py
file modified
+4
-4