mirror of
https://github.com/Pathduck/gallery3.git
synced 2026-06-19 08:09:54 -04:00
Merge branch 'master' of git@github.com:gallery/gallery3 Conflicts: modules/gallery/views/simple_uploader.html.php
9.1 KiB
9.1 KiB