Resolve conflict
Signed-off-by: Martyn Ranyard <m@rtyn.berlin>

Signed-off-by: Martyn Ranyard <m@rtyn.berlin>
2024-10-22 16:58:32 +00:00 · 2023-02-11 15:22:10 +01:00 · 2024-10-22 16:58:32 +00:00 · 2023-02-11 21:46:58 +01:00 · 2023-02-11 20:00:12 +01:00 · 2023-02-11 19:59:44 +01:00
diff --git a/Martyn Ranyard b/Martyn Ranyard
Martyn Ranyard 8c28ff3d98 Resolve conflict Signed-off-by: Martyn Ranyard <m@rtyn.berlin>		2024-10-22 16:58:32 +00:00
docker/ssh	Allow Remote port binding	2023-02-11 15:22:10 +01:00
jelly	Resolve conflict	2024-10-22 16:58:32 +00:00
lidarr	correct port pls	2023-02-11 21:46:58 +01:00
prowlarr	Add Prowlarr	2023-02-11 20:00:12 +01:00
radarr	correct the mount	2023-02-11 19:59:44 +01:00
sonarr	initial cut sonarr to radar	2023-02-11 20:26:14 +01:00
README.md	Initial commit	2023-02-11 12:22:17 +00:00