Viewing all changes in revision 588.3.22.
- Committer: maurofmferrao
- Date: 2018-05-10 12:25:40 UTC
- mfrom: (630)
- mto: (632.1.1)
- mto: This revision was merged to the branch mainline in revision 633.
- Revision ID: git-v1:183c7ea3a8d9565ac4399216052f59d3bf6ad9d0
Merged upstream develop
- files added:
- Dockerfile.cypress
- cypress
- cypress/integration
- cypress/plugins
- cypress/support
- web/theme/default/libraries
- 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
