Merge remote-tracking branch 'opf/feature/rails3' into feature/merge_planning_element_type_with_type

11 years ago · d173ef3b30
parent 16f77c6fc6 6eb1665c48
commit d173ef3b30
2 changed files with 3 additions and 1 deletions
--- a/doc/CHANGELOG.md
+++ b/doc/CHANGELOG.md
@ -1,5 +1,7 @@
 # Changelog

+## 3.0.0pre9
+
 * `#1517` Journal changed_data cannot contain the changes of a wiki_content content
 * `#779`  Integrate password expiration
 * `#1461` Integration Activity Plugin
--- a/lib/open_project/version.rb
+++ b/lib/open_project/version.rb
@ -32,7 +32,7 @@ module OpenProject
    #
    #   2.0.0debian-2
    def self.special
-      'pre8'
+      'pre9'
    end

    def self.revision