Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Merge branch 'master' into wordpress-code-blocks
  • Loading branch information
ralsina committed May 20, 2015
2 parents 7e63940 + 18ab727 commit 1990a5b
Show file tree
Hide file tree
Showing 189 changed files with 50,405 additions and 125 deletions.
1 change: 1 addition & 0 deletions CHANGES.txt
Expand Up @@ -12,6 +12,7 @@ Features
Bugfixes
--------

* Use a global directory for gallery images, ignoring translations (Issue #1726)
* The post-list directive only triggers rebuilds if timeline changes (Issue #1688)
* Don’t check the same remote URL more than once (Issue #1732)
* All remotely checked links resulted in incorrect warnings (`nikola check -lr`)
Expand Down
8 changes: 4 additions & 4 deletions bower_components/jquery-colorbox/.bower.json
@@ -1,7 +1,7 @@
{
"name": "jquery-colorbox",
"description": "jQuery lightbox and modal window plugin",
"version": "1.6.0",
"version": "1.6.1",
"dependencies": {
"jquery": ">=1.3.2"
},
Expand Down Expand Up @@ -38,11 +38,11 @@
"example4/index.html",
"example5/index.html"
],
"_release": "1.6.0",
"_release": "1.6.1",
"_resolution": {
"type": "version",
"tag": "1.6.0",
"commit": "7816dbccff2a0450fd53e726b7096ac38c1fe30c"
"tag": "1.6.1",
"commit": "b817f48e5b8e5fa694020ef5fe2ccfd76d2bf4f0"
},
"_source": "git://github.com/jackmoore/colorbox.git",
"_target": "~1.6.0",
Expand Down

0 comments on commit 1990a5b

Please sign in to comment.