Merge branch 'release/1.x' of https://github.com/massiveart/MassiveSearchBundle into release/2.0

Author: alexander-schranz

composer.json

@@ -56,10 +56,9 @@
     },
     "extra": {
         "branch-alias": {
-            "dev-release/1.0": "1.0-dev",
-            "dev-release/1.1": "1.1-dev",
-            "dev-release/2.0": "2.0-dev",
-            "dev-master": "2.1-dev"
+            "dev-release/1.x": "1.0-dev",
+            "dev-release/2.x": "2.1-dev",
+            "dev-master": "2.2-dev"
         }
     }
 }