Merge branch 'beta2'

oroinc · Oct 28, 2013 · 3b307ac · 3b307ac
1 parent a2300f1
commit 3b307ac
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 1 deletion.
diff --git a/.travis.yml b/.travis.yml
@@ -1,7 +1,6 @@
 language: php
 
 php:
-    - 5.3
     - 5.4
     - 5.5
 

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,27 @@
+CHANGELOG for 1.0.0-beta2
+===================
+This changelog references the relevant changes (new features, changes and bugs) done in 1.0.0-beta2 versions.
+
+* 1.0.0-beta2 (2013-10-28)
+ * Minimum PHP version: PHP 5.4.4
+ * Installer enhancements
+ * Automatic bundles distribution for application
+ * Routes declaration on Bundles level
+ * System Help and Tooltips
+ * RequireJS optimizer utilization
+ * ACL Caching
+
+CHANGELOG for 1.0.0-beta1
+===================
+This changelog references the relevant changes (new features, changes and bugs) done in 1.0.0-beta1 versions.
+
+* 1.0.0-beta1 (2013-09-30)
+ * New ACL implementation
+ * Emails synchronization via IMAP
+ * Custom entities and fields in usage
+ * Managing relations between entities
+ * Grid views
+
 CHANGELOG for 1.0.0-alpha6
 ===================
 This changelog references the relevant changes (new features, changes and bugs) done in 1.0.0-alpha6 versions.
-Original file line number
+Diff line change
@@ -1,7 +1,6 @@
     language: php
     php:
-        - 5.3
         - 5.4
         - 5.5
@@ Expand Down @@