merge master into coderbye

2015-02-13 16:56:09 -05:00
parent b691a35163 54901a4b9b
commit 0eededde36
4 changed files with 13 additions and 12 deletions
--- a/views/bonfire/bonfire.jade
+++ b/views/bonfire/bonfire.jade
@@ -42,4 +42,4 @@ block content
                    br
                    ul#testSuite.list-group
                    br
-                    script(src='/js/lib/bonfire/bonfireFramework_v0.1.0.js')
+                    script(src='/js/lib/bonfire/bonfireFramework_v0.1.1.js')
--- a/views/bonfire/show.jade
+++ b/views/bonfire/show.jade
@@ -96,7 +96,7 @@ block content
                form.code
                    .form-group.codeMirrorView
                        textarea#codeEditor(autofocus=true)
-                script(src='/js/lib/bonfire/bonfireFramework_v0.1.0.js')
+                script(src='/js/lib/bonfire/bonfireFramework_v0.1.1.js')