diff options
author | navateja | 2014-06-09 14:44:36 +0530 |
---|---|---|
committer | navateja | 2014-06-09 14:44:36 +0530 |
commit | 594d9f6d85f6b1c6a953a64892cd2236529f0398 (patch) | |
tree | 16caf49a3ccd1db02996f35fd89af09515a74e27 /.gitignore | |
parent | ab7efe6bf2da9b31b31a3af859e9f7f413fd2d0d (diff) | |
parent | 8973f0c3e19ffafee489a3dcfce03303120ed22b (diff) |
Merge remote-tracking branch 'upstream/dev' into keyboard_shortcuts_overlay
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 |