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.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
        "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
        "This file is @generated automatically"
    ],
-    "hash": "70ca29984807ed324db890c91c3a1492",
+    "hash": "05f03078291036582d00ac77cb0c77e2",
    "packages": [
        {
            "name": "alt-three/emoji",