Skip to content

Commit

Permalink
Merge pull request #85 from akintolga/master
Browse files Browse the repository at this point in the history
Updating cores for 1.0.9-RC4
  • Loading branch information
akintolga authored Aug 14, 2016
2 parents d502844 + b691717 commit baf4d20
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 1 deletion.
2 changes: 1 addition & 1 deletion client/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"name": "superdesk",
"license": "GPL-3.0",
"dependencies": {
"superdesk-core": "superdesk/superdesk-client-core#beac67bdc",
"superdesk-core": "superdesk/superdesk-client-core#48c9013a5",
"babel-core": "^6.10.4",
"babel-loader": "^6.2.4",
"babel-preset-es2015": "^6.9.0",
Expand Down
4 changes: 4 additions & 0 deletions client/superdesk.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,10 @@ module.exports = function() {
}
},

feature: {
elasticHighlight: true
},

view: {
timeformat: 'HH:mm',
dateformat: 'DD/MM/YYYY'
Expand Down

0 comments on commit baf4d20

Please sign in to comment.