Skip to content

Commit

Permalink
Merge branch 'dev'
Browse files Browse the repository at this point in the history
  • Loading branch information
stuhlmueller committed Jun 23, 2016
2 parents fad4487 + fa55227 commit f23943d
Show file tree
Hide file tree
Showing 4 changed files with 2 additions and 8 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ node_modules
npm-debug.log
bundle/
docs/_build
docs/_static
docs/_templates
src/dists.js
src/inference/enumerate.js
Expand Down
2 changes: 0 additions & 2 deletions docs/_static/custom.css

This file was deleted.

5 changes: 0 additions & 5 deletions docs/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -141,11 +141,6 @@
# so a file named "default.css" will overwrite the builtin "default.css".
html_static_path = ['_static']

# https://obda.net/blog/custom-css-and-js-for-sphinx-generated-documentation/
html_context = {
'css_files': ['_static/custom.css']
}

# Add any extra paths that contain custom files (such as robots.txt or
# .htaccess) here, relative to this directory. These files are copied
# directly to the root of the documentation.
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "webppl",
"description": "Probabilistic programming for the web",
"version": "0.8.0",
"version": "0.8.1",
"author": "webppl contributors",
"main": "src/main.js",
"repository": {
Expand Down

0 comments on commit f23943d

Please sign in to comment.