Merge branch 'develop'

Alex-D · Oct 19, 2016 · f3570b6 · f3570b6
2 parents 38c9e3d + 4d44fd6
commit f3570b6
Show file tree

Hide file tree

Showing 4 changed files with 2 additions and 2 deletions.
diff --git a/bower.json b/bower.json
@@ -1,6 +1,6 @@
 {
   "name": "trumbowyg",
-  "version": "2.4.0",
+  "version": "2.4.1",
   "homepage": "https://github.com/Alex-D/Trumbowyg",
   "authors": [
     {

diff --git a/Gulpfile.js → gulpfile.js b/Gulpfile.js → gulpfile.js
diff --git a/package.json b/package.json
@@ -2,7 +2,7 @@
   "name": "trumbowyg",
   "title": "Trumbowyg",
   "description": "A lightweight WYSIWYG editor",
-  "version": "2.4.0",
+  "version": "2.4.1",
   "main": "dist/trumbowyg.js",
   "homepage": "http://alex-d.github.io/Trumbowyg",
   "author": {

diff --git a/plugins/colors/Gulpfile.js → plugins/colors/gulpfile.js b/plugins/colors/Gulpfile.js → plugins/colors/gulpfile.js