Merge pull request #28 from firebase/firebase-2.x

v2.0.0
FirebaseExtended · Nov 6, 2014 · 0722426 · 0722426
2 parents 459361a + 3bb43d5
commit 0722426
Show file tree

Hide file tree

Showing 14 changed files with 2,879 additions and 57 deletions.
diff --git a/.gitignore b/.gitignore
@@ -8,4 +8,7 @@ node_modules
 _site
 
 # Compiled
-build
+build
+
+# Bower
+bower_components
diff --git a/Gruntfile.js b/Gruntfile.js
@@ -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',

diff --git a/bower.json b/bower.json
@@ -1,7 +1,7 @@
 {
   "name": "firechat",
   "description": "Firechat: Real-time Chat powered by Firebase",
-  "version": "1.0.0",
+  "version": "2.0.0",
   "authors": [
     "Firebase <support@firebase.com> (https://www.firebase.com/)"
   ],
-Original file line number
+Diff line change
@@ Expand Up / @@ -8,4 +8,7 @@ node_modules @@
     _site
     # Compiled
-    build
+    build
+    # Bower
+    bower_components