Join GitHub today
GitHub is home to over 40 million developers working together to host and review code, manage projects, and build software together.Sign up
Add addons controlpanel #297
* master: (183 commits) Add start-backend script to makefile. Add advanced customization docs Improve formatting of README Improve the README Back to development Release 1.7.0 Put image zooming into the right place. Fix image float/left right on image tile. Add missing points for document, update general docs org Back to development Release 1.6.1 Prepare for release Fix regression on position of the add tile button Remove debug dangling logging Fix post release back to development script, by adding semver.inc helper Fix version on back to development manually Back to development Release 1.6.0 add semantic classnames externally changelog ...
# Conflicts: # src/components/index.js # src/components/manage/Tiles/HeroImageLeft/Edit.jsx # src/components/manage/Tiles/HeroImageLeft/Edit.test.jsx # src/components/manage/Tiles/HeroImageLeft/View.jsx # src/components/manage/Tiles/HeroImageLeft/View.test.jsx # src/components/manage/Tiles/HeroImageLeft/__snapshots__/Edit.test.jsx.snap # src/components/manage/Tiles/HeroImageLeft/__snapshots__/View.test.jsx.snap # src/components/manage/Tiles/Text/Edit.jsx # src/config/Tiles.jsx
Add this suggestion to a batch that can be applied as a single commit. This suggestion is invalid because no changes were made to the code. Suggestions cannot be applied while the pull request is closed. Suggestions cannot be applied while viewing a subset of changes. Only one suggestion per line can be applied in a batch. Add this suggestion to a batch that can be applied as a single commit. Applying suggestions on deleted lines is not supported. You must change the existing code in this line in order to create a valid suggestion. Outdated suggestions cannot be applied. This suggestion has been applied or marked resolved. Suggestions cannot be applied from pending reviews.