Merge branch '5.3.x' into 6.0.x

polimediaupv · Sep 25, 2018 · fb3e223 · fb3e223
2 parents d360f68 + c2de28b
commit fb3e223
Show file tree

Hide file tree

Showing 4 changed files with 263 additions and 717 deletions.
diff --git a/CHANGELOG b/CHANGELOG
@@ -78,6 +78,23 @@ CHANGELOG
   * New plugin: Usertracking xAPI plugin (@dpeite)
   * New plugin: Usertracking Piwik plugin
 
+* Paella 5.2.17
+
+  * Bug fixed in elasticsearch plugin
+
+* Paella 5.2.16
+
+  * Improvements on HLS plugin
+  * Bug fixed in footprints plugin
+
+* Paella 5.2.15
+
+  * Legal info plugin improvements
+
+* Paella 5.2.14
+
+  * Legal info plugin added
+
 * Paella 5.2.13
 
   * Fixed a bug when loading captions in an not supported format

diff --git a/config/config.json b/config/config.json
@@ -174,8 +174,8 @@
       "es.upv.paella.defaultKeysPlugin": {"enabled": true }
     }
   },
-    "standalone" : {
-        "repository": "../repository/"
+  "standalone" : {
+    "repository": "../repository/"
   },
   "skin": {
     "available": [