Merge remote-tracking branch 'origin/master'

Conflicts:
	package.json
master
Buddy Sandidge 10 years ago
commit 17de8e7fb6

@ -1,2 +1,9 @@
# phantom-talk
Slide Deck for PhantomJS Talk
# Run
docker run -p 8000:8000 buddys/phantom-talk
open http://localhost:8000
Use the right and left arrows to move between slides

@ -18,7 +18,7 @@
],
"dependencies": {
"commonmark": "~0.17.1",
"handlebars": "~1.3.0",
"handlebars": "~3.0.2",
"marionette": "~2.3.1",
"normalize-scss": "~3.0.2",
"prism": "git@github.com:LeaVerou/prism.git#gh-pages",

@ -10,9 +10,9 @@
"test": "grunt test"
},
"author": "Buddy Sandidge",
"repository" : {
"type" : "git",
"url" : "https://github.com/xbudex/phantom-talk.git"
"repository": {
"type": "git",
"url": "https://github.com/xbudex/phantom-talk.git"
},
"license": "ISC",
"devDependencies": {
@ -23,7 +23,7 @@
"grunt-contrib-clean": "^0.6.0",
"grunt-contrib-compass": "^1.0.1",
"grunt-contrib-copy": "^0.7.0",
"grunt-contrib-handlebars": "^0.8.0",
"grunt-contrib-handlebars": "^0.10.2",
"grunt-contrib-jshint": "^0.11.0",
"grunt-contrib-requirejs": "^0.4.4",
"grunt-contrib-watch": "^0.6.1",
@ -40,6 +40,6 @@
"dependencies": {
"async": "^0.9.0",
"express": "^4.11.2",
"handlebars": "^1.3.0"
"handlebars": "^3.0.2"
}
}

@ -1,16 +1,16 @@
{
"name": "handlebars",
"version": "1.3.0",
"version": "3.0.2",
"main": "handlebars.js",
"dependencies": {},
"homepage": "https://github.com/components/handlebars.js",
"_release": "1.3.0",
"_release": "3.0.2",
"_resolution": {
"type": "version",
"tag": "v1.3.0",
"commit": "ddd21a44be399ae4de486ddd868bacf84e92b9c4"
"tag": "v3.0.2",
"commit": "1ad00eb64322229a10067e1391fb3b46365d760b"
},
"_source": "git://github.com/components/handlebars.js.git",
"_target": "~1.3.0",
"_target": "~3.0.2",
"_originalSource": "handlebars"
}

@ -9,3 +9,4 @@ Package Managers
* [Bower](http://twitter.github.com/bower/): `handlebars`
* [Component](http://github.com/component/component): `components/handlebars.js`
* [Composer](http://packagist.org/packages/components/handlebars.js): `components/handlebars.js`
* [jspm](http://jspm.io): `github:components/handlebars.js`

@ -1,6 +1,6 @@
{
"name": "handlebars",
"version": "1.3.0",
"version": "3.0.2",
"main": "handlebars.js",
"dependencies": {}
}

@ -11,7 +11,8 @@ Gem::Specification.new do |gem|
gem.description = %q{Handlebars.js source code wrapper for (pre)compilation gems.}
gem.summary = %q{Handlebars.js source code wrapper}
gem.homepage = "https://github.com/wycats/handlebars.js/"
gem.version = package["version"]
gem.version = package["version"].sub "-", "."
gem.license = "MIT"
gem.files = [
'handlebars.js',

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

@ -2,7 +2,7 @@
<package>
<metadata>
<id>handlebars.js</id>
<version>1.3.0</version>
<version>3.0.2</version>
<authors>handlebars.js Authors</authors>
<licenseUrl>https://github.com/wycats/handlebars.js/blob/master/LICENSE</licenseUrl>
<projectUrl>https://github.com/wycats/handlebars.js/</projectUrl>

File diff suppressed because one or more lines are too long

File diff suppressed because it is too large Load Diff

File diff suppressed because one or more lines are too long

File diff suppressed because it is too large Load Diff

File diff suppressed because one or more lines are too long

@ -0,0 +1,8 @@
{
"jspm": {
"main": "handlebars",
"shim": { "handlebars": { "exports": "Handlebars" } },
"files": ["handlebars.js"],
"buildConfig": { "minify": true }
}
}
Loading…
Cancel
Save