9415a232b0
Conflicts: .gitignore .npmignore Gemfile.lock Gruntfile.js bower.json core/clientold/assets/fonts/icons.dev.svg core/clientold/assets/fonts/icons.eot core/clientold/assets/fonts/icons.svg core/clientold/assets/fonts/icons.ttf core/clientold/assets/fonts/icons.woff core/clientold/assets/sass/ie.scss core/clientold/assets/sass/layouts/auth.scss core/clientold/assets/sass/layouts/editor.scss core/clientold/assets/sass/layouts/errors.scss core/clientold/assets/sass/layouts/manage.scss core/clientold/assets/sass/layouts/plugins.scss core/clientold/assets/sass/layouts/settings.scss core/clientold/assets/sass/layouts/users.scss core/clientold/assets/sass/modules/animations.scss core/clientold/assets/sass/modules/breakpoint.scss core/clientold/assets/sass/modules/breakpoint/_context.scss core/clientold/assets/sass/modules/breakpoint/_helpers.scss core/clientold/assets/sass/modules/breakpoint/_no-query.scss core/clientold/assets/sass/modules/breakpoint/_parsers.scss core/clientold/assets/sass/modules/breakpoint/_respond-to.scss core/clientold/assets/sass/modules/breakpoint/parsers/_double.scss core/clientold/assets/sass/modules/breakpoint/parsers/_query.scss core/clientold/assets/sass/modules/breakpoint/parsers/_resolution.scss core/clientold/assets/sass/modules/breakpoint/parsers/_single.scss core/clientold/assets/sass/modules/breakpoint/parsers/_triple.scss core/clientold/assets/sass/modules/breakpoint/parsers/double/_default-pair.scss core/clientold/assets/sass/modules/breakpoint/parsers/double/_default.scss core/clientold/assets/sass/modules/breakpoint/parsers/double/_double-string.scss core/clientold/assets/sass/modules/breakpoint/parsers/resolution/_resolution.scss core/clientold/assets/sass/modules/breakpoint/parsers/single/_default.scss core/clientold/assets/sass/modules/breakpoint/parsers/triple/_default.scss core/clientold/assets/sass/modules/forms.scss core/clientold/assets/sass/modules/global.scss core/clientold/assets/sass/modules/icons.scss core/clientold/assets/sass/modules/mixins.scss core/clientold/assets/sass/modules/normalize.scss core/clientold/assets/sass/screen.scss
29 lines
353 B
Plaintext
29 lines
353 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/server/data/export/exported*
|
|
**/*.db*
|
|
*.db*
|
|
.sass*
|
|
.af*
|
|
.git*
|
|
.groc*
|
|
*.iml
|
|
config.js
|
|
CONTRIBUTING.md
|
|
SECURITY.md
|
|
.travis.yml
|
|
*.html
|
|
bower_components/**
|