Merge branch 'master' of https://github.com/OnroerendErfgoed/atramhasis…

… into manage_languages
OnroerendErfgoed · May 3, 2016 · ad38c86 · ad38c86
2 parents 9fbdcc3 + 98739ab
commit ad38c86
Show file tree

Hide file tree

Showing 5 changed files with 1,992 additions and 781 deletions.
diff --git a/atramhasis/static/admin/bower.json b/atramhasis/static/admin/bower.json
@@ -1,6 +1,6 @@
 {
   "name": "atradmin",
-  "version": "0.4.4",
+  "version": "0.5.0",
   "authors": [
     "Flanders Heritage Agency <ict@onroerenderfgoed.be>"
   ],
@@ -15,16 +15,13 @@
     "tests"
   ],
   "dependencies": {
-    "dijit": "~1.10.4",
-    "dojo": "~1.10.4",
-    "util": "dojo-util#~1.10.4",
-    "dgrid": "~0.4.1",
+    "dijit": "~1.10.5",
+    "dojo": "~1.10.5",
+    "util": "dojo-util#~1.10.5",
+    "dgrid": "~1.0.0",
     "dstore": "~1.1.1",
     "dGrowl": "0.1.2",
     "foundation": "~5.5.0",
-    "font-awesome": "~4.3.0"
-  },
-  "resolutions": {
-    "dstore": "1.1.0"
+    "font-awesome": "~4.6.1"
   }
 }
diff --git a/atramhasis/static/bower.json b/atramhasis/static/bower.json
@@ -1,10 +1,10 @@
 {
   "name": "atramhasis",
-  "version": "0.0.1",
+  "version": "0.5.0",
   "private": "true",
   "dependencies": {
     "foundation": "~5.5.0",
-    "font-awesome": "~4.3.0",
+    "font-awesome": "~4.6.1",
     "d3": "~3.5.6"
   }
 }