Merge branch 'master' into prettier-styling

jshcrowthe · web-flow · commit cdce37987240 · 2017-07-06T16:30:52.000-07:00
diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
@@ -12,8 +12,8 @@
 # You can also use email addresses if you prefer.
 
 # Database Code
-src/database  @mikelehen @jdimond @schmidt-sebastian
-tests/database  @mikelehen @jdimond @schmidt-sebastian
+src/database  @mikelehen @schmidt-sebastian
+tests/database  @mikelehen @schmidt-sebastian
 
 # Storage Code
 src/storage  @sphippen
