Skip to content

Commit 4c99c10

Browse files
authored
Merge branch 'master' into agj/changelog-0.3.0
2 parents dbb6846 + c96a1b8 commit 4c99c10

File tree

5 files changed

+7
-6
lines changed

5 files changed

+7
-6
lines changed

.gitignore

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,5 +10,6 @@
1010
.ruby-version
1111
dist/
1212
bower_components/
13-
node_modules/
13+
node_modules
1414
npm-debug.log
15+
package-lock.json

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22
"name": "sphinx_rtd_theme",
33
"version": "0.3.0",
44
"private": true,
5-
"dependencies": {},
65
"devDependencies": {
6+
"bower": "^1.8.4",
77
"browserify": "^13.0.0",
88
"connect-livereload": "~0.6.0",
99
"grunt": "~1.0.1",

sphinx_rtd_theme/static/css/badge_only.css

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

sphinx_rtd_theme/static/css/theme.css

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

sphinx_rtd_theme/static/js/theme.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)