TryGhost/Ghost
1
0
Fork 0
mirror of https://github.com/TryGhost/Ghost.git synced 2024-11-24 06:35:49 +03:00
Code Issues Projects Releases Wiki Activity

Bower's indentation is changed (grumble)

Browse Source 
Closes #3130.

Because I flipped the table a TON of times that one file creating bloody merge conflicts ALL THE TIME. I have better use of my time than fixing indentation in merge conflict files. </rant>
This commit is contained in:
Gabor Javorszky 2014-06-29 14:54:07 +01:00
parent 2d64372d6e
commit ee70622264
1 changed files with 25 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
bower.json
View File

@ -1,30 +1,27 @@
{
"name": "ghost",
"dependencies": {
"backbone": "1.0.0",
"codemirror": "4.0.1",
"Countable": "2.0.2",
"ember": "1.5.0",
"ember-data": "~1.0.0-beta.8",
"ember-load-initializers": "git://github.com/stefanpenner/ember-load-initializers.git#0.0.1",
"ember-resolver": "git://github.com/stefanpenner/ember-jj-abrams-resolver.git#181251821cf513bb58d3e192faa13245a816f75e",
"fastclick": "1.0.0",
"ghost-ui": "0.8.1",
"handlebars": "1.3.0",
"ic-ajax": "1.0.1",
"jquery": "1.11.0",
"jquery-file-upload": "9.5.6",
"jquery-hammerjs": "1.0.1",
"jquery-ui": "1.10.4",
"keymaster": "madrobby/keymaster#0f09fc1b7e66c2b7e07afe89a419366dcf2d1cd8",
"lodash": "2.4.1",
"moment": "2.4.0",
"nprogress": "0.1.2",
"showdown": "https://github.com/ErisDS/showdown.git#v0.3.2-ghost",
"validator-js": "3.4.0",
"loader.js": "stefanpenner/loader.js#1.0.0"
},
"resolutions": {
"ember": "~1.4.0"
}
"name": "ghost",
"dependencies": {
"backbone": "1.0.0",
"codemirror": "4.0.1",
"Countable": "2.0.2",
"ember": "1.5.0",
"ember-data": "~1.0.0-beta.8",
"ember-load-initializers": "git://github.com/stefanpenner/ember-load-initializers.git#0.0.1",
"ember-resolver": "git://github.com/stefanpenner/ember-jj-abrams-resolver.git#181251821cf513bb58d3e192faa13245a816f75e",
"fastclick": "1.0.0",
"ghost-ui": "0.8.1",
"handlebars": "1.3.0",
"ic-ajax": "1.0.1",
"jquery": "1.11.0",
"jquery-file-upload": "9.5.6",
"jquery-hammerjs": "1.0.1",
"jquery-ui": "1.10.4",
"keymaster": "madrobby/keymaster#0f09fc1b7e66c2b7e07afe89a419366dcf2d1cd8",
"lodash": "2.4.1",
"moment": "2.4.0",
"nprogress": "0.1.2",
"showdown": "https://github.com/ErisDS/showdown.git#v0.3.2-ghost",
"validator-js": "3.4.0",
"loader.js": "stefanpenner/loader.js#1.0.0"
}
}