Skip to content
Snippets Groups Projects
Commit d012ef7d authored by Andreas Gohr's avatar Andreas Gohr
Browse files

Merge remote-tracking branch 'origin/master'

Conflicts:
	inc/lang/bg/lang.php
parents 84a355b6 3240c7a0
No related branches found
No related tags found
Loading
Showing with 29 additions and 47 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