Merge pull request #15 from SU-SWS/7.x-2.6

7.x-2.6
SU-SWS · Sep 5, 2018 · 4166614 · 4166614
2 parents 06d253d + c247fae
commit 4166614
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 2 deletions.
diff --git a/CHANGELOG.txt b/CHANGELOG.txt
@@ -1,6 +1,12 @@
 Stanford WYSIWYG x.x-x.x xxxx-xx-xx
 -----------------------------------
 
+Stanford WYSIWYG 7.x-2.6 2018-09-05
+-----------------------------------
+- Re-exported Feature to be compatible with wysiwyg >= 7.x-2.5
+- Added wysiwyg dependency to composer.json at version ~2.5
+- Updated .info file depedency constraint to 2.5
+
 Stanford WYSIWYG 7.x-2.5 2018-06-27
 -----------------------------------
 - Added codeclimate.yml

diff --git a/README.md b/README.md
@@ -1,5 +1,5 @@
 # [Stanford WYSIWYG](https://github.com/SU-SWS/stanford_wysiwyg)
-##### Version: 7.x-2.6-dev
+##### Version: 7.x-2.6
 
 Maintainers: [jbickar](https://github.com/jbickar), [sherakama](https://github.com/sherakama)
 [Changelog.txt](CHANGELOG.txt)

diff --git a/stanford_wysiwyg.info b/stanford_wysiwyg.info
@@ -2,7 +2,7 @@ name = Stanford WYSIWYG
 description = Baseline WYSIWYG Feature
 core = 7.x
 package = Stanford
-version = 7.x-2.6-dev
+version = 7.x-2.6
 project = stanford_wysiwyg
 dependencies[] = better_formats
 dependencies[] = features