Merge pull request #105 from mdhaman/master

Updating core dependencies.
superdesk · Aug 26, 2016 · 5d3ea64 · 5d3ea64
2 parents 143283b + b5ecf31
commit 5d3ea64
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/client/package.json b/client/package.json
@@ -2,7 +2,7 @@
     "name": "superdesk",
     "license": "GPL-3.0",
     "dependencies": {
-        "superdesk-core": "superdesk/superdesk-client-core#43641c8be",
+        "superdesk-core": "superdesk/superdesk-client-core#b4ca7cce6",
         "babel-core": "^6.10.4",
         "babel-loader": "^6.2.4",
         "babel-preset-es2015": "^6.9.0",
@@ -48,6 +48,6 @@
         "protractor-flake": "1.0.1",
         "style-loader": "^0.13.1",
         "webpack": "^1.13.1",
-        "webpack-dev-server": "^1.14.1"
+        "webpack-dev-server": "1.14.1"
     }
 }
diff --git a/server/requirements.txt b/server/requirements.txt
@@ -4,5 +4,5 @@ pyodbc==3.0.10
 unidecode==0.04.19
 
 
-git+git://github.com/superdesk/superdesk-core.git@204ea3de0#egg=Superdesk-Core
+git+git://github.com/superdesk/superdesk-core.git@a3965a579#egg=Superdesk-Core