Skip to content

Commit

Permalink
Merge d612848 into 076987f
Browse files Browse the repository at this point in the history
  • Loading branch information
benderTheCrime committed Dec 21, 2015
2 parents 076987f + d612848 commit 21ef488
Show file tree
Hide file tree
Showing 5 changed files with 13 additions and 5 deletions.
2 changes: 1 addition & 1 deletion bin/angie
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
'use strict';

// TODO check to see that the most up to date version is installed
global.ANGIE_VERSION = '0.4.6';
global.ANGIE_VERSION = '0.4.7';

require('babel/register')({
only: [ '**/node_modules/angie*/**', '**/src/**' ],
Expand Down
2 changes: 1 addition & 1 deletion bin/angie-dist
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
'use strict';

// TODO check to see that the most up to date version is installed
global.ANGIE_VERSION = '0.4.6';
global.ANGIE_VERSION = '0.4.7';

require('babel/register')({
only: [ '**/src/**' ],
Expand Down
4 changes: 4 additions & 0 deletions md/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,10 @@
All notable changes to this project will be documented in this file.
This project adheres to [Semantic Versioning](http://semver.org/).

### [0.4.7] - 2015-12-20
#### Fixed
- Fixed an issue with the `angie shell` command preventing proper use of that CLI option

### [0.4.6] - 2015-11-02
#### Changed
- Force library to use a 5.x version of Babel
Expand Down
8 changes: 6 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,11 @@
{
"name": "angie",
"version": "0.4.6",
"authors": "Joe Groseclose <@benderTheCrime>",
"version": "0.4.7",
"author": {
"name" : "Joe Groseclose",
"email" : "joe.groseclose@gmail.com",
"url" : "http://joegroseclose.com"
},
"description": "Angie: A Module-Based NodeJS Web Application Framework in ES6",
"license": "MIT",
"main": "dist/index.js",
Expand Down
2 changes: 1 addition & 1 deletion src/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ if (argv.help || argv.h) {
runTests();
break;
case 'shell':
watch();
$$watch(args);
break;
default:
help();
Expand Down

0 comments on commit 21ef488

Please sign in to comment.