Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: getnikola/nikola
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: fe52de9ab666
Choose a base ref
...
head repository: getnikola/nikola
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 77a5b46c8a35
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on Jul 10, 2015

  1. flake8 fixes

    gt committed Jul 10, 2015
    Copy the full SHA
    51c3871 View commit details

  2. Merge pull request #1882 from notfoss/master 

    flake8 fixes
    @Kwpolska
    Kwpolska committed Jul 10, 2015
    Copy the full SHA
    77a5b46 View commit details
Showing with 3 additions and 3 deletions.
  1. +3 −3 nikola/conf.py.in
6 changes: 3 additions & 3 deletions nikola/conf.py.in
View file
Original file line number Diff line number Diff line change
@@ -229,7 +229,7 @@ WRITE_TAG_CLOUD = True
# "blogging": "Meta-blog posts about blogging about blogging.",
# "open source": "My contributions to my many, varied, ever-changing, and eternal libre software projects."
# },
#}
# }


# If you do not want to display a tag publicly, you can mark it as hidden.
@@ -272,7 +272,7 @@ HIDDEN_TAGS = ['mathjax']
# "blogging": "Meta-blog posts about blogging about blogging.",
# "open source": "My contributions to my many, varied, ever-changing, and eternal libre software projects."
# },
#}
# }

# If you do not want to display a category publicly, you can mark it as hidden.
# The category will not be displayed on the category list page.
@@ -820,7 +820,7 @@ MARKDOWN_EXTENSIONS = ['fenced_code', 'codehilite', 'extra']
# <input type="text" name="q" maxlength="255" results="0" placeholder="Search"/>
# </form>
# <!-- End of custom search -->
#""" % SITE_URL
# """ % SITE_URL

# Use content distribution networks for jQuery, twitter-bootstrap css and js,
# and html5shiv (for older versions of Internet Explorer)