diff options
| author | Alex Xu <alex_y_xu@yahoo.ca> | 2014-03-11 17:52:44 -0400 |
|---|---|---|
| committer | Alex Xu <alex_y_xu@yahoo.ca> | 2014-03-11 17:52:44 -0400 |
| commit | 39e4c20cf742ca57da48db8c1b9f0fd09f7f038c (patch) | |
| tree | 6fdc78ba75d02d1bf85a62967b24f799acad45cc /.gitignore | |
| parent | 69890d17a01426cf7de8b6aa1dc64b56dfb7449d (diff) | |
| parent | 6c7ec4995dc309715c0cfc769d523afb173cd983 (diff) | |
| download | html5ks-39e4c20cf742ca57da48db8c1b9f0fd09f7f038c.tar.xz html5ks-39e4c20cf742ca57da48db8c1b9f0fd09f7f038c.zip | |
Merge branch 'master' of happinessforme.com:html5ks
Conflicts:
Makefile
Diffstat (limited to '.gitignore')
| -rw-r--r-- | .gitignore | 10 |
1 files changed, 5 insertions, 5 deletions
@@ -1,14 +1,14 @@ -# unrpyc built code -/unrpyc/*.json* -/unrpyc/*.rpyc -# generated nginx conf - see nginx.sh -/nginx.gen.conf # ignore 'copyrighted' contents similar to emulators /www/favicon.ico /www/json /www/dump /rpy +/unrpyc/*.json* +/unrpyc/*.rpyc # generated files /www/js/all.min.js* /node_modules + +# generated nginx conf - see nginx.sh +/nginx.gen.conf |