Merge branch 'master' into Ardenian-patch-1

IDotD · Jan 6, 2017 · f9535af · f9535af
2 parents 82e0d04 + 3a78f6c
commit f9535af
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 5 deletions.
diff --git a/.lgtm b/.lgtm
diff --git a/.pullapprove.yml b/.pullapprove.yml
@@ -0,0 +1,18 @@
+version: 2
+requirements:
+  signed_off_by:
+    required: false
+group_defaults:
+  approve_by_comment:
+    approve_regex: '(?i)^(:shipit:|:\\+1:|LGTM|Approved|Looks\\s+Good\\s+To\\s+Me|Seems\\s+good|Looks\\s+good)'
+  reset_on_push:
+    enabled: true
+groups:
+  -reviewers:
+    required: 1
+    users:
+      - Idrinth
+      - w20k
+    conditions:
+      branches:
+        - master
diff --git a/MAINTAINERS b/MAINTAINERS