Merge remote-tracking branch 'origin/master'

Evolveum · Mar 3, 2017 · b34a2ef · b34a2ef
2 parents 3387256 + bfe4c39
commit b34a2ef
Showing 1 changed file with 2 additions and 0 deletions.
diff --git a/.gitignore b/.gitignore
@@ -15,3 +15,5 @@ velocity.log
 dependency-reduced-pom.xml
 /nb-configuration.xml
 /nbactions.xml
+
+.DS_Store