Commit 1a73e607 authored 11 years ago by Thomas Müller

Merge branch 'master' into more-themable-strings

Conflicts:
	lib/template.php

Branches

No related tags found

No related merge requests found

Showing with 150 additions and 84 deletions

Some changes are not shown.

For a faster browsing experience, only 20 of 1000+ files are shown. Download one of the files below to see all changes.

Please register or to comment