diff options
| author | Thomas Mueller <thomas.mueller@tmit.eu> | 2013-02-22 22:59:09 +0100 |
|---|---|---|
| committer | Thomas Mueller <thomas.mueller@tmit.eu> | 2013-02-22 22:59:09 +0100 |
| commit | 9898ba4daf1acdead2ed5fa6024e779caafb353e (patch) | |
| tree | 3fc02fea4997344c73e0bc5ac7bdfc5616d7a7df /tests | |
| parent | 5062ae250b767867609f64c29ab4cde65f022b75 (diff) | |
| parent | 78fce834058a38a7dbcc5310e16095c743434bc6 (diff) | |
| download | nextcloud-server-9898ba4daf1acdead2ed5fa6024e779caafb353e.tar.gz nextcloud-server-9898ba4daf1acdead2ed5fa6024e779caafb353e.zip | |
Merge branch 'master' into master-sqlserver
Conflicts:
core/templates/installation.php
Diffstat (limited to 'tests')
0 files changed, 0 insertions, 0 deletions