diff options
| author | czaks <marcin@6irc.net> | 2013-07-18 15:19:03 -0400 |
|---|---|---|
| committer | czaks <marcin@6irc.net> | 2013-07-18 15:19:03 -0400 |
| commit | fa66b96240e9fdf7b179e604833d1c59702f9c39 (patch) | |
| tree | c7640caebe4294b1bd0eff54ce418fe0a251104c /.gitignore | |
| parent | 8c72c8a43232f137256fa170c889ba330ebba7af (diff) | |
| parent | e4bd9a6886af2a812ccc909d8ad957df1bdc5d2b (diff) | |
Merge branch 'master' of https://github.com/savetheinternet/Tinyboard
Conflicts:
post.php
Diffstat (limited to '.gitignore')
| -rw-r--r-- | .gitignore | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -14,7 +14,7 @@ /templates/cache
# other stuff
-.DS_Store?
+.DS_Store
thumbs.db
Icon?
Thumbs.db
|