YunoHost/yunohost-admin
1
0
Fork 0
mirror of https://github.com/YunoHost/yunohost-admin.git synced 2024-09-03 20:06:15 +02:00
Code Issues Projects Releases Packages Wiki Activity

Bad conflict fix

Browse source
This commit is contained in:
Alexandre Aubin 2021-10-19 19:50:44 +02:00
parent 1731bd0b10
commit d18277f17f
1 changed files with 0 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
debian/changelog vendored
View file

@ -74,7 +74,6 @@ yunohost-admin (4.3.0) testing; urgency=low
Thanks to all contributors <3 ! (axolotle, Christian Wehrli, Daniel, Éric Gaspar, JocelynDelalande, José M, liimee, ljf, Parviz Homayun, possy eater, ppr, saptrishi das biswas, Tymofii-Lytvynenko)
-- Alexandre Aubin <alex.aubin@mailoo.org> Sun, 19 Sep 2021 23:49:02 +0200
>>>>>>> dev
yunohost-admin (4.2.5) stable; urgency=low