Merge branch 'master' into og-poller

2013-03-27 21:00:09 +00:00
parent 6e527629a2 95bb8fc06c
commit b42daee4c1
3 changed files with 7 additions and 3 deletions
--- a/Netdisco/Changes
+++ b/Netdisco/Changes
@@ -3,6 +3,7 @@
  [BUG FIXES]

  * Rename plugins developer doc to .pod
+  * Update to latest Bootstrap and JQuery, and temp. fix #7326 in Bootstrap

 2.007000_001 - 2013-03-17

--- a/Netdisco/share/public/javascripts/bootstrap.min.js
+++ b/Netdisco/share/public/javascripts/bootstrap.min.js
--- a/Netdisco/share/public/javascripts/jquery-latest.min.js
+++ b/Netdisco/share/public/javascripts/jquery-latest.min.js