Skip to content
Snippets Groups Projects
Commit 2ac1f797 authored by con's avatar con
Browse files

Merge commit 'origin/1.2'

Conflicts:
	src/plugins/coreplugin/welcomemode.ui
parents 313cb44e 7b165504
No related branches found
No related tags found
No related merge requests found
Showing
with 249 additions and 197 deletions
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment