Merge remote-tracking branch 'origin/master' into obask-620-zoom-buttons

collectivemedia · Sep 15, 2015 · 20ee120 · 20ee120
2 parents 16b12cb + 414bc75
commit 20ee120
Show file tree

Hide file tree

Showing 23 changed files with 678 additions and 101 deletions.
diff --git a/.gitignore b/.gitignore
@@ -12,3 +12,4 @@ javadoc-tmp/
 **/.classpath
 **/.project
 **/.settings
+**/.DS_Store