merge with master

jcubic · Apr 5, 2018 · 5fe22be · 5fe22be
2 parents 8438b44 + 44b4feb
commit 5fe22be
Show file tree

Hide file tree

Showing 15 changed files with 55 additions and 18 deletions.
diff --git a/Makefile b/Makefile
@@ -1,4 +1,4 @@
-VERSION=1.12.1
+VERSION=1.14.0
 SED=sed
 CD=cd
 NPM=npm

diff --git a/README.md b/README.md
@@ -10,7 +10,7 @@ http://terminal.jcubic.pl
 
 [![npm](https://img.shields.io/badge/npm-DEV-blue.svg)](https://www.npmjs.com/package/jquery.terminal)
 ![bower](https://img.shields.io/badge/bower-DEV-yellow.svg)
-[![travis](https://travis-ci.org/jcubic/jquery.terminal.svg?branch=devel&5cb6e598c3730296960c165cdd9da1fc66169ff2)](https://travis-ci.org/jcubic/jquery.terminal)
+[![travis](https://travis-ci.org/jcubic/jquery.terminal.svg?branch=devel&8438b44b4f44c63bd6a2c1a5e3ff3f01cec448d0)](https://travis-ci.org/jcubic/jquery.terminal)
 [![Coverage Status](https://coveralls.io/repos/github/jcubic/jquery.terminal/badge.svg?branch=devel&8499de646897bbd4969a7aaff3a674c2)](https://coveralls.io/github/jcubic/jquery.terminal?branch=devel)
 ![downloads](https://img.shields.io/npm/dm/jquery.terminal.svg?style=flat)
 [![package quality](http://npm.packagequality.com/shield/jquery.terminal.svg)](http://packagequality.com/#?package=jquery.terminal)

diff --git a/bower.json b/bower.json
@@ -1,6 +1,6 @@
 {
     "name": "jquery.terminal",
-    "version": "1.12.1",
+    "version": "1.14.0",
     "main": [
         "js/jquery.terminal.min.js",
         "js/jquery.mousewheel-min.js",

diff --git a/css/jquery.terminal-1.12.1.css → css/jquery.terminal-1.14.0.css b/css/jquery.terminal-1.12.1.css → css/jquery.terminal-1.14.0.css
@@ -12,7 +12,7 @@
  * Copyright (c) 2011-2018 Jakub Jankiewicz <http://jcubic.pl>
  * Released under the MIT license
  *
- * Date: Thu, 05 Apr 2018 15:42:18 +0000
+ * Date: Thu, 05 Apr 2018 15:44:14 +0000
  */
 .terminal .terminal-output .format, .cmd .format,
 .cmd .prompt, .cmd .prompt div, .terminal .terminal-output div div{

diff --git a/css/jquery.terminal-1.12.1.min.css → css/jquery.terminal-1.14.0.min.css b/css/jquery.terminal-1.12.1.min.css → css/jquery.terminal-1.14.0.min.css
diff --git a/css/jquery.terminal.css b/css/jquery.terminal.css
@@ -12,7 +12,7 @@
  * Copyright (c) 2011-2018 Jakub Jankiewicz <http://jcubic.pl>
  * Released under the MIT license
  *
- * Date: Thu, 05 Apr 2018 15:42:18 +0000
+ * Date: Thu, 05 Apr 2018 15:44:14 +0000
  */
 .terminal .terminal-output .format, .cmd .format,
 .cmd .prompt, .cmd .prompt div, .terminal .terminal-output div div{