Merge branch 'master' into all-contributors/add-agl

2019-08-08 00:28:36 +02:00
parent 018311cfab dc94e73c62
commit 76e46605e3
2 changed files with 10 additions and 0 deletions
--- a/.all-contributorsrc
+++ b/.all-contributorsrc
@@ -32,6 +32,15 @@
        "bug",
        "code"
      ]
+    },
+    {    
+      "login": "merlokk",
+      "name": "Oleg Moiseenko",
+      "avatar_url": "https://avatars2.githubusercontent.com/u/807634?v=4",
+      "profile": "http://www.lotteam.com",
+      "contributions": [
+        "code"
+      ]
    }
  ],
  "contributorsPerLine": 7,