Merge branch 'master' of github.com:srct/advisor

22d987a6 · Daniel W Bond · d023f81d · b5e867dd · 22d987a6 · 22d987a6
Commit 22d987a6 authored Mar 01, 2014 by Daniel W Bond
--- a/advisor/static/__init__.py
+++ b/advisor/static/__init__.py
--- a/advisor/templates/__init__.py
+++ b/advisor/templates/__init__.py
--- a/requirements.txt
+++ b/requirements.txt
 Django==1.6.2
 argparse==1.2.1
+djangorestframework==2.3.12
 wsgiref==0.1.2