Merge branch 'release-0.7.0'

oat-sa · Jan 29, 2018 · b15bd7f · b15bd7f
2 parents 59961c0 + 7a488e6
commit b15bd7f
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 6 deletions.
diff --git a/locales/en-US/messages.po b/locales/en-US/messages.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
-"Project-Id-Version: TAO 3.1.0-sprint15\n"
-"PO-Revision-Date: 2015-12-23T13:39:49\n"
+"Project-Id-Version: TAO 3.3.0-sprint69\n"
+"PO-Revision-Date: 2018-01-29T11:59:17\n"
 "Last-Translator: TAO Translation Team <[email protected]>\n"
 "MIME-Version: 1.0\n"
 "Language: en-US\n"

diff --git a/manifest.php b/manifest.php
@@ -26,7 +26,7 @@
     'label' => 'FooBar power extension',
     'description' => 'Dummy test extension',
     'license' => 'GPL-2.0',
-    'version' => '0.6.2',
+    'version' => '0.7.0',
     'author' => 'Open Assessment Technologies, CRP Henri Tudor',
     'requires' => [
         'tao' => '*'

diff --git a/scripts/update/Updater.php b/scripts/update/Updater.php
@@ -34,6 +34,6 @@ class Updater extends \common_ext_ExtensionUpdater
      */
     public function update($initialVersion)
     {
-        $this->skip('0.1.0', '0.6.2');
+        $this->skip('0.1.0', '0.7.0');
     }
 }
diff --git a/views/js/controllers.min.js b/views/js/controllers.min.js
diff --git a/views/js/controllers.min.js.map b/views/js/controllers.min.js.map