Merge tag '1.26.1' into develop

pmb0 · pmb0 · commit c649ac127d24 · 2017-07-28T13:41:34.000+02:00
* Added missing ./build directory. [#246] * tag '1.26.1': release 1.26.1
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,6 @@
 # Changelog
 
-## Unreleased
+## v1.26.1, 2017-07-28
 
 * Added missing `./build` directory.([#246](https://github.com/heiseonline/shariff/issues/246))
 
diff --git a/bower.json b/bower.json
@@ -1,6 +1,6 @@
 {
   "name": "shariff",
-  "version": "1.25.2",
+  "version": "1.26.1",
   "homepage": "http://ct.de/-2467514",
   "authors": [
     "Ines Pauer <ipa@heise.de>",
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "shariff",
-  "version": "1.26.0",
+  "version": "1.26.1",
   "description": "Shariff enables website users to share their favorite content without compromising their privacy.",
   "main": "src/js/shariff.js",
   "scripts": {

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "shariff",`
`3`		`- "version": "1.26.0",`
	`3`	`+ "version": "1.26.1",`
`4`	`4`	`"description": "Shariff enables website users to share their favorite content without compromising their privacy.",`
`5`	`5`	`"main": "src/js/shariff.js",`
`6`	`6`	`"scripts": {`