mcyph b7c46c06a7 Merge remote-tracking branch 'upstream/development' ... # Conflicts: # src/pages/connections/HelloPort.js # src/pages/dnd_copypaste/Clipboard.js # src/pages/effects/Morph.js # src/pages/events/Boundary.js # src/pages/layout/AutoLayout.js # src/pages/layout/SwimLanes.js # src/pages/layout/Tree.js # src/pages/printing/PageBreaks.js # src/pages/shapes_stencils/Shape.js # src/pages/shapes_stencils/Stencils.js # src/pages/styles/HoverStyle.js # src/pages/styles/Stylesheet.js # src/pages/windows/Windows.js # src/pages/xml_json/FileIO.js # src/pages/xml_json/JsonData.js # src/pages/xml_json/UserObject.js # src/pages/zoom_offpage/OffPage.js # src/public/editors/config/editor-commons.xml # src/public/map-background/map-background.html		2021-04-25 18:11:00 +10:00
..
core	Merge remote-tracking branch 'upstream/development'	2021-04-25 18:11:00 +10:00
html	- Add more images.	2021-04-25 12:39:40 +09:00
react	- Restructure into a monorepo.	2021-04-15 13:12:12 +09:00