Skip to content
Snippets Groups Projects
Commit 3922be1b authored by con's avatar con
Browse files

Merge remote branch 'origin/2.0' 

Conflicts:
	src/plugins/texteditor/texteditoractionhandler.cpp
parents 17fd33bd 626221b6
No related branches found
No related tags found
Hide whitespace changes
Inline Side-by-side
Showing
with 564 additions and 346 deletions
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