Skip to content

Commit

Permalink
Merge branch 'version'
Browse files Browse the repository at this point in the history
  • Loading branch information
drudru committed May 22, 2015
2 parents d12e6f4 + 1505afd commit f71d27c
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 4 deletions.
4 changes: 2 additions & 2 deletions ansi_up.js
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
// ansi_up.js
// version : 1.2.0
// version : 1.2.1
// author : Dru Nelson
// license : MIT
// http://github.com/drudru/ansi_up

(function (Date, undefined) {

var ansi_up,
VERSION = "1.2.0",
VERSION = "1.2.1",

// check for nodeJS
hasModule = (typeof module !== 'undefined'),
Expand Down
2 changes: 1 addition & 1 deletion bower.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "ansi_up",
"main": "ansi_up.js",
"version": "1.2.0",
"version": "1.2.1",
"homepage": "https://github.com/drudru/ansi_up",
"authors": [
"drudru <drudru@gmail.com>"
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "ansi_up",
"version": "1.2.0",
"version": "1.2.1",
"description": "Convert ansi sequences in strings to colorful HTML",
"keywords": ["ansi", "html"],
"author": "drudru <drudru@gmail.com>",
Expand Down

0 comments on commit f71d27c

Please sign in to comment.