Skip to content
Snippets Groups Projects
Commit 7f4647ec authored by con's avatar con
Browse files

Merge remote branch 'origin/1.3' 

Conflicts:
	share/qtcreator/translations/translations.pro
parents f0674aa7 32b5d176
No related branches found
No related tags found
No related merge requests found
Expand all Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment