OSDN Git Service
Merge branch 'master' of https://git.yuki-lab.xyz/git/Yukidaruma-dev/serenelinux-system-pkg
# Conflicts:
# serenelinux-artworks/usr/share/backgrounds/serene/serene-wallpaper-1.png
# serenelinux-artworks/usr/share/backgrounds/serene/serene-wallpaper-2.png
# serenelinux-artworks/usr/share/backgrounds/serene/serene-wallpaper-3.png
# serenelinux-artworks/usr/share/backgrounds/serene/serene-wallpaper-4.png
# serenelinux-artworks/usr/share/images/desktop-base/serene-lockscreen_1280x1024.png
# serenelinux-artworks/usr/share/images/desktop-base/serene-lockscreen_1600x1200.png
# serenelinux-artworks/usr/share/images/desktop-base/serene-lockscreen_1920x1080.png
# serenelinux-artworks/usr/share/images/desktop-base/serene-lockscreen_1920x1200.png
# serenelinux-artworks/usr/share/images/desktop-base/serene-lockscreen_2560x1080.png
# serenelinux-artworks/usr/share/pixmaps/serene/icon.png
# serenelinux-artworks/usr/share/pixmaps/serene/icon_black.png
# serenelinux-artworks/usr/share/pixmaps/serene/icon_black_circle.png
# serenelinux-artworks/usr/share/pixmaps/serene/icon_circle.png
# serenelinux-artworks/usr/share/pixmaps/serene/icon_flat.png
# serenelinux-artworks/usr/share/pixmaps/serene/icon_flat_cicle.png
# serenelinux-artworks/usr/share/pixmaps/serene/icon_flat_noshadow.png
# serenelinux-artworks/usr/share/pixmaps/serene/icon_white.png
# serenelinux-artworks/usr/share/pixmaps/serene/icon_white_circle.png