diff options
author | Chris Lawrence | 2015-10-02 20:47:19 -0400 |
---|---|---|
committer | Chris Lawrence | 2015-10-02 20:47:19 -0400 |
commit | 69104e8e04c14ac91d396a41e0c05351ec2a96bf (patch) | |
tree | b95b95b20746a2a4d93fec64c4c4b10e6be85123 /.gitignore | |
parent | 54082a8d76e8c12bb5b424f7ff21644632f054aa (diff) | |
parent | 01c55d4cf6ff60772be8a86320c4a5bcd7719a05 (diff) |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to '.gitignore')
-rw-r--r-- | .gitignore | 4 |
1 files changed, 3 insertions, 1 deletions
@@ -3,4 +3,6 @@ log/*.log tmp/** node_modules/ -.sass-cache
\ No newline at end of file +.sass-cache +css/reveal.min.css +js/reveal.min.js |