merged

2013-06-04 16:04:12 -04:00
parent 9d42453b05
commit dc96bf524d
2 changed files with 23 additions and 0 deletions
@@ -15,4 +15,5 @@
 /tmp
 .elasticbeanstalk/

+# Ignore Mac folder settings
 .DS_Store