Merge branch '1.5' into 2.0

CHANGELOG-2.0.md

@@ -1,7 +1,8 @@
 CHANGELOG - ZIKULA 2.0.x
-------------------------
+========================
 
-* 2.0.4 (?)
+2.0.4 (2017-12-16)
+------------------
 
  - BC Breaks:
     - CSRF tokens are now different for HTTP and HTTPS (#3856). See http://symfony.com/blog/cve-2017-16653-csrf-protection-does-not-use-different-tokens-for-http-and-https for more information.
@@ -27,7 +28,8 @@ CHANGELOG - ZIKULA 2.0.x
     - zikula/oauth-module updated from 1.0.3 to 1.0.4
 
 
-* 2.0.3 (2017-11-04)
+2.0.3 (2017-11-04)
+------------------
 
  - Fixes:
     - Fixed getAttributeValue error in case attribute does not exist.
@@ -55,7 +57,8 @@ CHANGELOG - ZIKULA 2.0.x
     - zikula/profile-module updated from 3.0.2 to 3.0.3
 
 
-* 2.0.2 (2017-10-03)
+2.0.2 (2017-10-03)
+------------------
 
  - Fixes:
     - Allow hooks to be managed in display (#3793).
@@ -71,7 +74,8 @@ CHANGELOG - ZIKULA 2.0.x
     - symfony/symfony updated from 3.3.8 to 3.3.9
 
 
-* 2.0.1 (2017-09-01)
+2.0.1 (2017-09-01)
+------------------
 
  - Fixes:
     - Corrected conditional statement for searchable modules (#3752).
@@ -103,7 +107,8 @@ CHANGELOG - ZIKULA 2.0.x
     - symfony/symfony updated from 3.3.5 to 3.3.8
 
 
-* 2.0.0 (2017-08-05)
+2.0.0 (2017-08-05)
+------------------
 
  - BC Breaks:
     - Removed all @deprecated items from Core-1.x.

README.md

@@ -1,8 +1,13 @@
+<<<<<<< HEAD
 [![Build Status](https://travis-ci.org/zikula/core.svg?branch=master)](https://travis-ci.org/zikula/core)
 [![StyleCI](https://styleci.io/repos/781544/shield?branch=master)](https://styleci.io/repos/781544)
 [![SensioLabsInsight](https://insight.sensiolabs.com/projects/cc7028a5-80d5-4835-a4a4-0a179a690487/mini.png)](https://insight.sensiolabs.com/projects/cc7028a5-80d5-4835-a4a4-0a179a690487)
 [![Code Climate](https://codeclimate.com/github/zikula/core/badges/gpa.svg)](https://codeclimate.com/github/zikula/core)
 [![Scrutinizer](https://scrutinizer-ci.com/g/zikula/core/badges/quality-score.png?b=master)](https://scrutinizer-ci.com/g/zikula/core/)
+=======
+[![Build Status](https://travis-ci.org/zikula/core.svg?branch=1.5)](https://travis-ci.org/zikula/core)
+[![StyleCI](https://styleci.io/repos/781544/shield)](https://styleci.io/repos/781544)
+>>>>>>> 1.5
 
 Zikula Core - Application Framework
 ===================================

ROADMAP.md

@@ -1,5 +1,5 @@
 Zikula Core Roadmap
--------------------
+===================
 
 Zikula manages its releases through a time-based model and follows the [Semantic Versioning](http://semver.org/) strategy. 
 A new Zikula patch version comes out about once per month. The Core-1.5 branch and the Core-2.0 branch