nextcloud/lib
Daniel Calviño Sánchez 00c3a7eb4c Fix HTTP client given options being overriden by default options
According to the array_merge documentation, "If the input arrays have
the same string keys, then the later value for that key will overwrite
the previous one." Thus, the default options must be the first parameter
passed to array_merge.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2018-06-14 21:36:04 +02:00
..
composer Merge pull request #9846 from nextcloud/feature/noid/add_stricter_csps 2018-06-13 23:19:10 +02:00
l10n [tx-robot] updated from transifex 2018-06-14 00:13:06 +00:00
private Fix HTTP client given options being overriden by default options 2018-06-14 21:36:04 +02:00
public Add stricter CSPs 2018-06-13 14:47:57 +02:00
autoloader.php move log constants to ILogger 2018-04-26 10:45:52 +02:00
base.php Configurable list for opt out from same site cookie protection 2018-06-06 22:13:35 +02:00
versioncheck.php Raise PHP version number to PHP 7.0 2018-01-12 14:26:10 +01:00