Merge branch '1.2'

Conflicts: composer.lock resources/views/partials/incidents.blade.php
2015-09-04 11:53:25 +01:00
parent 99cd275a9d 1ac4b7a64a
commit d20ee2987b
6 changed files with 40 additions and 6 deletions
--- a/composer.json
+++ b/composer.json
@@ -20,7 +20,7 @@
    ],
    "require": {
        "php": "^5.5.9",
-        "laravel/framework": "~5.1.10",
+        "laravel/framework": "5.1.12",
        "alt-three/emoji": "^1.2",
        "alt-three/validator": "^1.2",
        "barryvdh/laravel-cors": "^0.5",