Commit fdeef5e8 authored 11 years ago by Thomas Müller

Merge branch 'master' into fixing-appframework-master

Conflicts:
	lib/private/appframework/middleware/security/securitymiddleware.php
	tests/lib/appframework/middleware/security/SecurityMiddlewareTest.php

parents 60541358 c3f7d22a

Hide whitespace changes

Inline Side-by-side

Showing with 164 additions and 91 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.

Plain diff Email patch

Please register or to comment