Merge pull request #286 from xibosignage/develop

Release 1.8.3 into master
xibosignage · Nov 29, 2017 · 6fc36a6 · 6fc36a6
2 parents 576b6b5 + 5426316
commit 6fc36a6
Show file tree

Hide file tree

Showing 316 changed files with 12,594 additions and 6,307 deletions.
diff --git a/composer.json b/composer.json
@@ -60,7 +60,7 @@
     "xibosignage/xibo-xmr": "0.3",
     "tedivm/stash": "^0.14.1",
     "akrabat/rka-slim-controller": "^2.0",
-    "phenx/php-font-lib": "^0.4.0",
+    "phenx/php-font-lib": "^0.5.0",
     "abraham/twitteroauth": "^0.6.4",
     "symfony/event-dispatcher": "^3.1",
     "illuminate/database": "5.2.*",