Skip to content

Commit

Permalink
Merge pull request #28 from firebase/firebase-2.x
Browse files Browse the repository at this point in the history
v2.0.0
  • Loading branch information
Chris Raynor committed Nov 6, 2014
2 parents 459361a + 3bb43d5 commit 0722426
Show file tree
Hide file tree
Showing 14 changed files with 2,879 additions and 57 deletions.
5 changes: 4 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -8,4 +8,7 @@ node_modules
_site

# Compiled
build
build

# Bower
bower_components
2 changes: 1 addition & 1 deletion Gruntfile.js
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ module.exports = function(grunt) {
concat: {
js: {
src: [
'src/js/libs/underscore-1.4.4.min.js',
'src/js/libs/underscore-1.7.0.min.js',
'compiled/templates.js',
'src/js/shims.js',
'src/js/firechat.js',
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": "firechat",
"description": "Firechat: Real-time Chat powered by Firebase",
"version": "1.0.0",
"version": "2.0.0",
"authors": [
"Firebase <[email protected]> (https://www.firebase.com/)"
],
Expand Down
Loading

0 comments on commit 0722426

Please sign in to comment.