31f41822e0
Conflicts: .gitignore Gruntfile.js bower.json core/client/assets/lib/showdown/extensions/ghostdown.js core/client/assets/vendor/showdown/extensions/ghostdown.js core/client/router.js core/clientold/assets/vendor/chart.min.js core/clientold/assets/vendor/codemirror/addon/mode/overlay.js core/clientold/assets/vendor/codemirror/codemirror.js core/clientold/assets/vendor/codemirror/mode/gfm/gfm.js core/clientold/assets/vendor/codemirror/mode/gfm/index.html core/clientold/assets/vendor/codemirror/mode/gfm/test.js core/clientold/assets/vendor/codemirror/mode/markdown/index.html core/clientold/assets/vendor/codemirror/mode/markdown/markdown.js core/clientold/assets/vendor/codemirror/mode/markdown/test.js core/clientold/assets/vendor/countable.js core/clientold/assets/vendor/fastclick.js core/clientold/assets/vendor/icheck/jquery.icheck.min.js core/clientold/assets/vendor/jquery.hammer.min.js core/clientold/assets/vendor/nprogress.js core/clientold/assets/vendor/packery.pkgd.min.js core/clientold/assets/vendor/showdown/extensions/ghostdown.js core/clientold/assets/vendor/showdown/showdown.js core/clientold/assets/vendor/validator-client.js core/test/unit/client_ghostdown_spec.js core/test/unit/client_showdown_int_spec.js
31 lines
392 B
Plaintext
31 lines
392 B
Plaintext
!**
|
|
.build
|
|
.dist
|
|
.tmp
|
|
docs/**
|
|
_site/**
|
|
content/images/**
|
|
!content/images/README.md
|
|
content/themes/**
|
|
!content/themes/casper/**
|
|
content/apps/**
|
|
!content/apps/README.md
|
|
node_modules/**
|
|
core/test/**
|
|
core/clientold/assets/sass/**
|
|
core/server/data/export/exported*
|
|
**/*.db*
|
|
*.db*
|
|
.sass*
|
|
.af*
|
|
.git*
|
|
.groc*
|
|
*.iml
|
|
config.js
|
|
CONTRIBUTING.md
|
|
SECURITY.md
|
|
.travis.yml
|
|
Gemfile*
|
|
*.html
|
|
bower_components/**
|