Merge branch 'master' into prng, resolve merge conflicts

2016-08-15 18:15:57 +02:00
parent e23322b61e bb7fb2054a
commit 75cb771e4b
47 changed files with 1971 additions and 347 deletions
--- a/composer.json
+++ b/composer.json
@@ -19,7 +19,8 @@
    ],
    "require": {
        "php": "^5.2.6 || ^7.0",
-        "paragonie/random_compat": "^2.0"
+        "paragonie/random_compat": "^2.0",
+        "yzalis/identicon": "^1.1"
    },
    "require-dev": {
        "codacy/coverage": "dev-master",