Skip to content

Commit

Permalink
Merge pull request #267 from mdhaman/1.7
Browse files Browse the repository at this point in the history
Update cores.
  • Loading branch information
Mayur Dhamanwala authored Apr 6, 2017
2 parents 20b4fd8 + 859dc4c commit 2917a3a
Show file tree
Hide file tree
Showing 4 changed files with 2 additions and 31 deletions.
2 changes: 1 addition & 1 deletion client/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,6 @@
"name": "superdesk",
"license": "GPL-3.0",
"dependencies": {
"superdesk-core": "superdesk/superdesk-client-core#ef13e958c"
"superdesk-core": "superdesk/superdesk-client-core#ed5f3db"
}
}
28 changes: 0 additions & 28 deletions server/data/groups.json

This file was deleted.

2 changes: 1 addition & 1 deletion server/requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,4 @@ unidecode==0.04.19
newrelic>=2.66,<2.67
titlecase==0.8.2

git+git://github.com/superdesk/superdesk-core.git@9e8818852#egg=Superdesk-Core
git+git://github.com/superdesk/superdesk-core.git@39e5dad5#egg=Superdesk-Core
1 change: 0 additions & 1 deletion server/settings.py
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,6 @@ def env(variable, fallback_value=None):
'apps.tasks',
'apps.preferences',
'apps.spikes',
'apps.groups',
'apps.prepopulate',
'apps.legal_archive',
'apps.search',
Expand Down

0 comments on commit 2917a3a

Please sign in to comment.