rapatrier la nouvelle version de Symphony

LICENCE

@@ -1,5 +1,5 @@
 Copyright 2008-2015 Alistair Kearney, Allen Chang, Scott Hughes
-Copyright 2016 Symphony CMS Community (https://github.com/symphonycms/symphony-2/graphs/contributors)
+Copyright 2016-2017 Symphony CMS Community (https://github.com/symphonycms/symphony-2/graphs/contributors)
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

README.markdown

@@ -4,11 +4,18 @@
 
 [![Scrutinizer Code Quality](https://scrutinizer-ci.com/g/symphonycms/symphony-2/badges/quality-score.png?b=master)](https://scrutinizer-ci.com/g/symphonycms/symphony-2/?branch=master)
 
+<<<<<<< HEAD
 - Version: 2.6.7
 - Date: 08th February 2016
 - [Release notes](http://getsymphony.com/download/releases/version/2.6.7/)
 - [Github repository](https://github.com/symphonycms/symphony-2/tree/2.6.7)
 - [MIT Licence](https://github.com/symphonycms/symphony-2/blob/master/LICENCE)
+=======
+- Version: 2.6.11
+- Date: 18th January 2017
+- [Release notes](http://getsymphony.com/download/releases/version/2.6.11/)
+- [Github repository](https://github.com/symphonycms/symphony-2/tree/2.6.11)
+>>>>>>> dba6406087cb72e824b3f01d710cd52da3afaa26
 
 ## Contents
 
@@ -26,7 +33,7 @@
 
 ## Overview
 
-Symphony is a `PHP` & `MySQL` based CMS that utilises `XML` and `XSLT` as its core technologies. This repository represents version `2.6.7` and is considered stable.
+Symphony is a `PHP` & `MySQL` based CMS that utilises `XML` and `XSLT` as its core technologies. This repository represents version `2.6.11` and is considered stable.
 
 Useful places:
 

composer.json

@@ -1,6 +1,6 @@
 {
     "name": "symphonycms/symphony-2",
-    "version": "2.6.7",
+    "version": "2.6.11",
     "description": "Symphony is a PHP & MySQL based CMS that utilises XML and XSLT as its core technologies.",
     "homepage": "http://www.getsymphony.com",
     "license": "MIT",

install/index.php

@@ -27,7 +27,7 @@
     define('DOCROOT', $clean_path);
 
     // Required boot components
-    define('VERSION', '2.6.7');
+    define('VERSION', '2.6.11');
     define('INSTALL', DOCROOT . '/install');
 
     // Include autoloader:

install/migrations/2.6.10.php

@@ -0,0 +1,14 @@
+<?php
+
+    class migration_2610 extends Migration
+    {
+        public static function getVersion()
+        {
+            return '2.6.10';
+        }
+
+        public static function getReleaseNotes()
+        {
+            return 'http://getsymphony.com/download/releases/version/2.6.10/';
+        }
+    }

install/migrations/2.6.11.php

@@ -0,0 +1,14 @@
+<?php
+
+    class migration_2611 extends Migration
+    {
+        public static function getVersion()
+        {
+            return '2.6.11';
+        }
+
+        public static function getReleaseNotes()
+        {
+            return 'http://getsymphony.com/download/releases/version/2.6.11/';
+        }
+    }

install/migrations/2.6.8.php

@@ -0,0 +1,14 @@
+<?php
+
+    class migration_268 extends Migration
+    {
+        public static function getVersion()
+        {
+            return '2.6.8';
+        }
+
+        public static function getReleaseNotes()
+        {
+            return 'http://getsymphony.com/download/releases/version/2.6.8/';
+        }
+    }

install/migrations/2.6.9.php

@@ -0,0 +1,14 @@
+<?php
+
+    class migration_269 extends Migration
+    {
+        public static function getVersion()
+        {
+            return '2.6.9';
+        }
+
+        public static function getReleaseNotes()
+        {
+            return 'http://getsymphony.com/download/releases/version/2.6.9/';
+        }
+    }

package.json

@@ -1,6 +1,6 @@
 {
   "name": "symphonycms",
-  "version": "2.6.7",
+  "version": "2.6.11",
   "repository": {
     "type": "git",
     "url": "https://github.com/symphonycms/symphony-2.git"