diff options
| author | Bjoern Schiessle <schiessle@owncloud.com> | 2013-10-04 12:30:49 +0200 |
|---|---|---|
| committer | Bjoern Schiessle <schiessle@owncloud.com> | 2013-10-04 12:30:49 +0200 |
| commit | 51295e9a6b9cd8e351132e988858b5d4bd223968 (patch) | |
| tree | 7d2da02957552a8ac49eb6f2f3bd6b08e1049406 /lib/private/setup/postgresql.php | |
| parent | a223cf769a670c1c8926baf4ded445af300d056d (diff) | |
| parent | 514d7a884a5211fe246487421ea8103202d004d7 (diff) | |
| download | nextcloud-server-51295e9a6b9cd8e351132e988858b5d4bd223968.tar.gz nextcloud-server-51295e9a6b9cd8e351132e988858b5d4bd223968.zip | |
Merge branch 'master' into sharing_mail_notification_master
Conflicts:
apps/files/index.php
apps/files/templates/index.php
Diffstat (limited to 'lib/private/setup/postgresql.php')
0 files changed, 0 insertions, 0 deletions