Clean up merge modal and allow "live-merge" of explorative and project#2935
Merged
philippotto merged 30 commits intomasterfrom clean-up-merge-modalJul 30, 2018
+448-270
Commits
Commits on Jul 19, 2018
- committed
- committed
- committed
- committed
- committed
- committed
Commits on Jul 20, 2018
- committed
- committed
- committed
- committed
- committed
- committed
Commits on Jul 23, 2018
- committed
- committed
- committed
- committed
- committed
- committed
- committed
- committed
- committed
Commits on Jul 24, 2018
Commits on Jul 26, 2018
- committed
Commits on Jul 30, 2018
- committed
- authored
- authored
- authored
- authored