Merge branch 'b3' into requirejs-b3

kroman0 · Aug 12, 2013 · cd1ee84 · cd1ee84
2 parents 1fe5dbc + 23baa20
commit cd1ee84
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/app/templates/index.html b/app/templates/index.html
@@ -23,7 +23,7 @@
     <div class="container view">
         <div class="content">
             <div class="progress progress-striped active">
-                <div class="bar" style="width: 100%;"></div>
+                <div class="progress-bar" style="width: 100%;"></div>
             </div>
         </div>
     </div>

diff --git a/buildout.cfg b/buildout.cfg
@@ -11,7 +11,7 @@ allow-hosts =
 [gae_sdk]
 # Dowloads and extracts the App Engine SDK.
 recipe = appfy.recipe.gae:sdk
-url = http://googleappengine.googlecode.com/files/google_appengine_1.8.2.zip
+url = http://googleappengine.googlecode.com/files/google_appengine_1.8.3.zip
 
 [gae_tools]
 # Installs appcfg, dev_appserver and python executables in the bin directory.