1
0
mirror of https://github.com/flarum/core.git synced 2025-08-28 18:40:46 +02:00

Compare commits

...

4 Commits

Author SHA1 Message Date
Daniel Klabbers
8a1bcf30d2 releasing beta 11.1 2019-12-02 09:28:48 +01:00
Franz Liedke
ff384569f8 Fix implementations of settings repo interface 2019-12-01 22:10:58 +01:00
Daniel Klabbers
f64a253450 Revert "7.4 release, forcing tests to work with them"
This reverts commit da5628d125.
2019-11-29 13:01:51 +01:00
Daniel Klabbers
da5628d125 7.4 release, forcing tests to work with them 2019-11-29 13:00:34 +01:00
4 changed files with 9 additions and 3 deletions

View File

@@ -1,5 +1,11 @@
# Changelog # Changelog
## [0.1.0-beta.11](https://github.com/flarum/core/compare/v0.1.0-beta.11...v0.1.0-beta.11.1)
### Fixed
- Saving custom css in admin failed (#1946)
## [0.1.0-beta.11](https://github.com/flarum/core/compare/v0.1.0-beta.10...v0.1.0-beta.11) ## [0.1.0-beta.11](https://github.com/flarum/core/compare/v0.1.0-beta.10...v0.1.0-beta.11)
### Added ### Added

View File

@@ -23,7 +23,7 @@ class Application extends Container implements ApplicationContract
* *
* @var string * @var string
*/ */
const VERSION = '0.1.0-beta.11'; const VERSION = '0.1.0-beta.11.1';
/** /**
* The base path for the Flarum installation. * The base path for the Flarum installation.

View File

@@ -35,7 +35,7 @@ class OverrideSettingsRepository implements SettingsRepositoryInterface
$this->overrides = $overrides; $this->overrides = $overrides;
} }
public function all() public function all(): array
{ {
return array_merge($this->inner->all(), $this->overrides); return array_merge($this->inner->all(), $this->overrides);
} }

View File

@@ -11,7 +11,7 @@ namespace Flarum\Settings;
class UninstalledSettingsRepository implements SettingsRepositoryInterface class UninstalledSettingsRepository implements SettingsRepositoryInterface
{ {
public function all() public function all(): array
{ {
return []; return [];
} }