Merge pull request #136 from mdhaman/1.2

chore(core): Updating cores.
superdesk · Sep 28, 2016 · 8fc2f73 · 8fc2f73
2 parents 4dfb369 + 6808bc9
commit 8fc2f73
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -27,8 +27,8 @@ cache:
     - $HOME/.npm
 
 before_install:
-    - nvm install 0.12
-    - nvm use 0.12
+    - nvm install node
+    - nvm use node
     - node --version
     - npm install -g npm@latest
     - npm install -g grunt-cli

diff --git a/server/requirements.txt b/server/requirements.txt
@@ -4,4 +4,4 @@ pyodbc==3.0.10
 unidecode==0.04.19
 
 
-git+git://github.com/superdesk/superdesk-core.git@64123a99#egg=Superdesk-Core
+git+git://github.com/superdesk/superdesk-core.git@6fe05bdd#egg=Superdesk-Core
Original file line number	Diff line number	Diff line change
Expand Up		@@ -4,4 +4,4 @@ pyodbc==3.0.10
		unidecode==0.04.19


		git+git://github.com/superdesk/superdesk-core.git@64123a99#egg=Superdesk-Core
		git+git://github.com/superdesk/superdesk-core.git@6fe05bdd#egg=Superdesk-Core