Merge commit 'b3b4f77'

Browse Source

# Conflicts:
#	themes/intotheeast/templates/partials/trip-feed-col.html.twig
#	themes/intotheeast/templates/trip.html.twig

...

This commit is contained in:

m038

2026-07-08 00:08:37 +02:00

parent d4fcbecaf1 b3b4f774d0

commit 1dc9c9854c

77 changed files with 3246 additions and 151 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

docs/demo/trips/italy-2026-demo/dailies/2026-09-01-0700-setting-off-from-campiglia.entry/entry.md → docs/demo/trips/italy-2026-demo/dailies/2026-09-01-0700-setting-off-from-campiglia.entry/entry.en.md

docs/demo/trips/italy-2026-demo/dailies/2026-09-02-1130-maremma-in-full-sun.entry/entry.md → docs/demo/trips/italy-2026-demo/dailies/2026-09-02-1130-maremma-in-full-sun.entry/entry.en.md

docs/demo/trips/italy-2026-demo/dailies/2026-09-02-1900-the-lagoon-at-dusk.entry/entry.md → docs/demo/trips/italy-2026-demo/dailies/2026-09-02-1900-the-lagoon-at-dusk.entry/entry.en.md

docs/demo/trips/italy-2026-demo/dailies/2026-09-03-0800-orbetello-morning.entry/entry.md → docs/demo/trips/italy-2026-demo/dailies/2026-09-03-0800-orbetello-morning.entry/entry.en.md

docs/demo/trips/italy-2026-demo/dailies/2026-09-03-1700-tufa-and-towers.entry/entry.md → docs/demo/trips/italy-2026-demo/dailies/2026-09-03-1700-tufa-and-towers.entry/entry.en.md

docs/demo/trips/italy-2026-demo/dailies/2026-09-04-1500-the-long-climb-north.entry/entry.md → docs/demo/trips/italy-2026-demo/dailies/2026-09-04-1500-the-long-climb-north.entry/entry.en.md

docs/demo/trips/italy-2026-demo/dailies/2026-09-05-0830-before-the-heat-arrives.entry/entry.md → docs/demo/trips/italy-2026-demo/dailies/2026-09-05-0830-before-the-heat-arrives.entry/entry.en.md

docs/demo/trips/italy-2026-demo/dailies/2026-09-05-1800-into-siena.entry/entry.md → docs/demo/trips/italy-2026-demo/dailies/2026-09-05-1800-into-siena.entry/entry.en.md

docs/demo/trips/italy-2026-demo/dailies/2026-09-06-2000-florence-by-nightfall.entry/entry.md → docs/demo/trips/italy-2026-demo/dailies/2026-09-06-2000-florence-by-nightfall.entry/entry.en.md

docs/demo/trips/italy-2026-demo/dailies/2026-09-07-1400-one-rest-day.entry/entry.md → docs/demo/trips/italy-2026-demo/dailies/2026-09-07-1400-one-rest-day.entry/entry.en.md

docs/demo/trips/italy-2026-demo/dailies/2026-09-08-0730-dawn-on-the-cecina-coast.entry/entry.md → docs/demo/trips/italy-2026-demo/dailies/2026-09-08-0730-dawn-on-the-cecina-coast.entry/entry.en.md

docs/demo/trips/italy-2026-demo/dailies/2026-09-08-1630-home.entry/entry.md → docs/demo/trips/italy-2026-demo/dailies/2026-09-08-1630-home.entry/entry.en.md