Merge pull request #2344 from vikhyat/poll-plugin

Don't ignore the emoji and poll plugins in .gitignore
This commit is contained in:
Sam 2014-05-16 09:04:34 +10:00
commit d86a6b184b
1 changed files with 5 additions and 1 deletions

6
.gitignore vendored
View File

@ -36,10 +36,14 @@ config/discourse.conf
# Ignore all logfiles and tempfiles.
/log/*.log
/tmp
/plugins
/logfile
log/
# Ignore plugins except for the bundled ones.
/plugins
!/plugins/emoji
!/plugins/poll
/spec/fixtures/plugins/my_plugin/auto_generated
# Ignore Eclipse .project file