diff options
author | Mark Schmitz <kramred@gmail.com> | 2018-06-07 14:23:53 +0100 |
---|---|---|
committer | Mark Schmitz <kramred@gmail.com> | 2018-06-07 14:23:53 +0100 |
commit | 0deaedeeaef088040fb015f5be3e270e3bae508e (patch) | |
tree | bbdab87adf45592a6a881f808e667ba5c21312a9 /composer.json | |
parent | f6b3295d28352cbeb46dff04799cf8f4d39087bb (diff) | |
parent | 17e45b2e9c33c736751e059276fadb480f98e621 (diff) | |
download | Shaarli-0deaedeeaef088040fb015f5be3e270e3bae508e.tar.gz Shaarli-0deaedeeaef088040fb015f5be3e270e3bae508e.tar.zst Shaarli-0deaedeeaef088040fb015f5be3e270e3bae508e.zip |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'composer.json')
-rw-r--r-- | composer.json | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/composer.json b/composer.json index 15e082f8..0d4c623c 100644 --- a/composer.json +++ b/composer.json | |||
@@ -36,7 +36,8 @@ | |||
36 | "Shaarli\\Api\\Controllers\\": "application/api/controllers", | 36 | "Shaarli\\Api\\Controllers\\": "application/api/controllers", |
37 | "Shaarli\\Api\\Exceptions\\": "application/api/exceptions", | 37 | "Shaarli\\Api\\Exceptions\\": "application/api/exceptions", |
38 | "Shaarli\\Config\\": "application/config/", | 38 | "Shaarli\\Config\\": "application/config/", |
39 | "Shaarli\\Config\\Exception\\": "application/config/exception" | 39 | "Shaarli\\Config\\Exception\\": "application/config/exception", |
40 | "Shaarli\\Security\\": "application/security" | ||
40 | } | 41 | } |
41 | } | 42 | } |
42 | } | 43 | } |