Revision d42ef854
| ID | d42ef854b916ca8adb70e73e80e9bc535759fa6f |
| Parent | e7ad4152, a931ded7 |
| Child | c3be3dd6, 7cc5255e |
Merge remote-tracking branch 'origin/one-4.0' into feature-1825
Conflicts:
share/doc/states/states-simple.dot
src/sunstone/public/js/layout.js
src/sunstone/public/js/plugins/files-tab.js
src/sunstone/public/js/plugins/templates-tab.js
Files
- added
- modified
- copied
- renamed
- deleted