Merge branch 'develop' into l10n_develop

This commit is contained in:
James Cole
2017-02-16 22:42:24 +01:00
committed by GitHub
927 changed files with 40417 additions and 23932 deletions

View File

@@ -965,4 +965,4 @@ return [
// sandstorm.io errors and messages:
'sandstorm_not_available' => 'This function is not available when you are using Firefly III within a Sandstorm.io environment.',
];
];