Merge branch 'master' into issue-1342-account-name

Scifabric · Jan 16, 2017 · 7fd7f37 · 7fd7f37
2 parents 9e54a0a + f2bb900
commit 7fd7f37
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/requirements.txt b/requirements.txt
@@ -2,5 +2,4 @@
 
 -e git+https://github.com/maxcountryman/flask-login.git@13af160b3fd14dfb5f35f9cdc3863771efe194eb#egg=Flask-Login
 -e git+https://github.com/PyBossa/rq-dashboard.git#egg=rq-dashboard
--e git+https://github.com/miracle2k/webassets.git@f710ac9b2aa5b0e95d6599410ad985bf61fdff28#egg=webassets
 -e .
diff --git a/setup.py b/setup.py
@@ -54,7 +54,8 @@
     "libsass",
     "pyjwt",
     "flask_json_multidict",
-    "flask-cors>=3.0.2, <3.0.3"
+    "flask-cors>=3.0.2, <3.0.3",
+    "webassets>=0.12.1, <0.12.2"
 ]
 
 setup(