Skip to content
Commit 1a73e607 authored by Thomas Müller's avatar Thomas Müller
Browse files

Merge branch 'master' into more-themable-strings

Conflicts:
	lib/template.php
parents 72424800 7bb6aab8
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