diff options
author | ArthurHoaro <arthur@hoa.ro> | 2020-10-13 11:49:45 +0200 |
---|---|---|
committer | ArthurHoaro <arthur@hoa.ro> | 2020-10-13 11:49:45 +0200 |
commit | e6678e07ca24b77ac951b615d53538c17f35df55 (patch) | |
tree | fda6faecbc95e9eb2db4e59e1d3db75698618410 /AUTHORS | |
parent | 19989964f12317e71d4e853b03647e45f3b372ad (diff) | |
parent | 64152387d6177c7342d0c01965ba2181cc4e46f7 (diff) | |
download | Shaarli-e6678e07ca24b77ac951b615d53538c17f35df55.tar.gz Shaarli-e6678e07ca24b77ac951b615d53538c17f35df55.tar.zst Shaarli-e6678e07ca24b77ac951b615d53538c17f35df55.zip |
Merge remote-tracking branch 'parent/master' into v0.12
Diffstat (limited to 'AUTHORS')
-rw-r--r-- | AUTHORS | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -1,4 +1,4 @@ | |||
1 | 989 ArthurHoaro <arthur@hoa.ro> | 1 | 991 ArthurHoaro <arthur@hoa.ro> |
2 | 402 VirtualTam <virtualtam@flibidi.net> | 2 | 402 VirtualTam <virtualtam@flibidi.net> |
3 | 294 nodiscc <nodiscc@gmail.com> | 3 | 294 nodiscc <nodiscc@gmail.com> |
4 | 56 Sébastien Sauvage <sebsauvage@sebsauvage.net> | 4 | 56 Sébastien Sauvage <sebsauvage@sebsauvage.net> |