Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/master'
Browse files Browse the repository at this point in the history
  • Loading branch information
chriscconte committed Nov 14, 2016
2 parents b8387db + 5a007db commit 0b64db4
Showing 1 changed file with 5 additions and 2 deletions.
7 changes: 5 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,11 @@ npm test

### Framework Versions
AngularJS 1.5.8
Python 2.7
Django 1.10.2

Stream.io 1.0

Nodejs 7.1

Bootstrap 3.3.7

### Style Guide
Expand Down

0 comments on commit 0b64db4

Please sign in to comment.