hiMerge branch 'master' of https://github.com/NUDelta/DTRweb

Conflicts: public/.DS_Store public/images/.DS_Store server/.DS_Store
NUDelta · Feb 21, 2015 · 6209d8e · 6209d8e
2 parents 40d19ab + 9d4e54e
commit 6209d8e
Show file tree

Hide file tree

Showing 6 changed files with 1 addition and 0 deletions.
diff --git a/.DS_Store b/.DS_Store
diff --git a/.gitignore b/.gitignore
@@ -0,0 +1 @@
+*.DS_Store
diff --git a/public/.DS_Store b/public/.DS_Store
diff --git a/public/images/.DS_Store b/public/images/.DS_Store
diff --git a/public/images/projects/.DS_Store b/public/images/projects/.DS_Store
diff --git a/server/.DS_Store b/server/.DS_Store