Squashing conflict

danrpts · Sep 27, 2016 · 04815ff · 04815ff
2 parents 6b3f18a + f1e1078
commit 04815ff
Showing 1 changed file with 0 additions and 5 deletions.
diff --git a/webmail/javascripts/config/google.json b/webmail/javascripts/config/google.json