Merge pull request #111 from shlinkio/develop

Develop

.gitattributes

@@ -0,0 +1,24 @@
+/data/infra export-ignore
+/docs export-ignore
+/module/CLI/test export-ignore
+/module/CLI/test-resources export-ignore
+/module/Common/test export-ignore
+/module/Common/test-func export-ignore
+/module/Core/test export-ignore
+/module/Core/test-func export-ignore
+/module/Rest/test export-ignore
+.env.dist export-ignore
+.gitattributes export-ignore
+.gitignore export-ignore
+.phpstorm.meta.php export-ignore
+.scrutinizer.yml export-ignore
+.travis.yml export-ignore
+build.sh export-ignore
+CHANGELOG.md export-ignore
+docker-compose.override.yml.dist export-ignore
+docker-compose.yml export-ignore
+func_tests_bootstrap.php export-ignore
+indocker export-ignore
+phpcs.xml export-ignore
+phpunit.xml.dist export-ignore
+phpunit-func.xml export-ignore

CHANGELOG.md

@@ -1,5 +1,17 @@
 ## CHANGELOG
 
+### 1.6.2
+
+**Bugs**
+
+* [109: Fix installation error due to typo in latest migration](https://github.com/shlinkio/shlink/issues/109)
+
+### 1.6.1
+
+**Tasks**
+
+* [110: Create gitattributes file to define files to be excluded from distributable package](https://github.com/shlinkio/shlink/issues/110)
+
 ### 1.6.0
 
 **Features**

data/migrations/Version20171021093246.php

@@ -20,7 +20,7 @@ class Version20171021093246 extends AbstractMigration
     public function up(Schema $schema)
     {
         $shortUrls = $schema->getTable('short_urls');
-        if ($shortUrls->hasColumn('value_since')) {
+        if ($shortUrls->hasColumn('valid_since')) {
             return;
         }
 
@@ -39,7 +39,7 @@ class Version20171021093246 extends AbstractMigration
     public function down(Schema $schema)
     {
         $shortUrls = $schema->getTable('short_urls');
-        if (! $shortUrls->hasColumn('value_since')) {
+        if (! $shortUrls->hasColumn('valid_since')) {
             return;
         }