Skip to content
Snippets Groups Projects
Commit 0c1b02be authored by Gerrit Uitslag's avatar Gerrit Uitslag
Browse files

Merge remote-tracking branch 'origin/master' into FS#2697searchpagereadonly 

Conflicts:
	inc/lang/hr/searchpage.txt
	inc/lang/ko/searchpage.txt
parents 618191d0 da957271
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 1108 additions and 105 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