aboutsummaryrefslogtreecommitdiffstats
path: root/.gitignore
diff options
context:
space:
mode:
authorSam Potts <sam@selz.com>2017-04-25 12:40:13 +1000
committerGitHub <noreply@github.com>2017-04-25 12:40:13 +1000
commit948e2cc66c3b6fe8774b810f360017e1ea941137 (patch)
tree54236b0750588fe4838bc11826e81d8c6be92b5b /.gitignore
parent2a97a9a9c5213ea6fc2bbe830ff483fc7b60c247 (diff)
parent396b816a1f0cd4e1a7b1ecf5fd5523d47562ab89 (diff)
downloadplyr-948e2cc66c3b6fe8774b810f360017e1ea941137.tar.lz
plyr-948e2cc66c3b6fe8774b810f360017e1ea941137.tar.xz
plyr-948e2cc66c3b6fe8774b810f360017e1ea941137.zip
Merge branch 'develop' into blank-mp4
Diffstat (limited to '.gitignore')
-rw-r--r--.gitignore8
1 files changed, 4 insertions, 4 deletions
diff --git a/.gitignore b/.gitignore
index b7b9861e..f1ad5242 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,10 +3,10 @@ node_modules
*.sublime-workspace
.DS_Store
aws.json
-docs/index.dev.html
*.mp4
!dist/blank.mp4
-index-dev.html
+index-*.html
notes.txt
-*.vtt
-docs/index.dev.php
+.idea
+.DS_Store
+npm-debug.log \ No newline at end of file