Commit Graph

5 Commits

Author SHA1 Message Date
Mauricio Siu
fc447e3a9a fix: resolve conflict markers accidentally committed during meta migration
Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
2026-07-08 01:13:47 -06:00
Mauricio Siu
c6c07246b6 Merge remote-tracking branch 'origin/canary' into feature/add-dokploy-templates
# Conflicts:
#	blueprints/gotify/docker-compose.yml
#	blueprints/gotify/gotify.svg
#	blueprints/gotify/template.toml
#	blueprints/jellyseerr/docker-compose.yml
#	blueprints/jellyseerr/jellyseerr.svg
#	blueprints/jellyseerr/template.toml
#	blueprints/privatebin/docker-compose.yml
#	blueprints/privatebin/privatebin.svg
#	blueprints/privatebin/template.toml
#	blueprints/speedtest-tracker/docker-compose.yml
#	blueprints/speedtest-tracker/speedtest-tracker.svg
#	blueprints/speedtest-tracker/template.toml
#	meta.json
2026-07-08 00:05:19 -06:00
Rohit Mulani
5a193c5fb2 feat: add Gotify template (#946)
* feat: add Gotify template

* chore: pin gotify template version

---------

Co-authored-by: Rohit Mulani <289630555+rohitmulani63-ops@users.noreply.github.com>
2026-07-07 13:16:48 -06:00
NightVibes33
8c1a085acb refine added Dokploy templates 2026-05-21 15:36:50 +00:00
NightVibes33
b203c65ba6 feat: add Gotify and PairDrop templates 2026-05-20 20:45:13 +00:00