Merge branch 'delivery'

Conflicts: composer.lock install/insert.sql
2013-09-07 16:37:54 +02:00
parent 9ebf16f1f6 0aad4baf26
commit 1e660cd930
23 changed files with 669 additions and 51 deletions
--- a/composer.lock
+++ b/composer.lock
@@ -4,6 +4,7 @@
        "Read more about it at http://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file"
    ],
    "hash": "ba2f3e0943f00c7c3bf0c086bc611b0f",
+
    "packages": [
        {
            "name": "imagine/imagine",