Merge branch 'master' into type-hinting (6b061c23) · Commits · github / nextcloud / server

Commit 6b061c23 authored Mar 31, 2014 by

Bart Visscher

Merge branch 'master' into type-hinting

Conflicts:
	lib/private/image.php
	lib/private/l10n.php
	lib/private/request.php
	lib/private/share/mailnotifications.php
	lib/private/template/base.php

parents 8951328a ab696edb

Hide whitespace changes

Inline Side-by-side

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.

Plain diff Email patch

Please register or to comment