Merge pull request #29 from stopfstedt/prep_new_release

Prep new release
ucsf-web-services · Mar 24, 2015 · cb263d7 · cb263d7
2 parents 928c759 + 296d9d4
commit cb263d7
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/CHANGELOG.txt b/CHANGELOG.txt
@@ -1,3 +1,7 @@
+7.x-1.0-beta17
+--------------
+- Fixed image-paste functionality to work with latest Media module #27
+
 7.x-1.0-beta16
 --------------
 - Updated CKEditor to version 4.4.7 #25
@@ -28,7 +32,7 @@
 -------
 - fix for trailing space paste issue
 
-7.x-1.0-beta10 
+7.x-1.0-beta10
 -------
 - move IFRAME specific Css to separate file!
 

diff --git a/ucsf_webedit.info b/ucsf_webedit.info
@@ -3,7 +3,7 @@ description = A user-friendly, site-friendly authoring environment and WYSIWYG.
 core = 7.x
 package = UCSF
 php = 5.2.4
-version = 7.x-1.0-beta16
+version = 7.x-1.0-beta17
 project = ucsf_webedit
 dependencies[] = ckeditor_link
 dependencies[] = features