Viewing all changes in revision 614.4.4.
- Committer: Dan Garner
- Date: 2018-05-21 14:58:11 UTC
- mfrom: (644.1.8)
- mto: (614.1.6)
- mto: This revision was merged to the branch mainline in revision 648.
- Revision ID: git-v1:e7961b0ebe68a0c0bc5dd7b3abca007138b2cadd
Merge branch 'bugfix/1.8.10-pack1' into feature/r-graph
- files added:
- Dockerfile.cypress
- cypress
- cypress/integration
- cypress/plugins
- cypress/support
- web/theme/default/libraries/bootstrap-select-ajax
- web/theme/default/libraries/bootstrap-select-ajax/css
- web/theme/default/libraries/bootstrap-select-ajax/js
- web/theme/default/libraries/bootstrap-select-ajax/js/locale
- web/theme/default/libraries/bootstrap-tour
- files removed:
- modules/emojione/emojione.sprites.svg
- web/theme/default/img/screenshots
- files modified:
- .dockerignore
expand all
collapse all
added
removed
modules/emojione/emojione.sprites.png
modules/emojione/emojione.sprites.svg
web/theme/default/img/screenshots/calendar_screenshot.png
web/theme/default/img/screenshots/display_add_screenshot.png
web/theme/default/img/screenshots/layout_design_screenshot.png
