diff --git a/Gemfile b/Gemfile index 5dd813e..2ffe90c 100644 --- a/Gemfile +++ b/Gemfile @@ -2,8 +2,8 @@ source "https://rubygems.org" ruby "3.1.3" -gem "merged" , git: "https://github.com/HubFeenixMakers/merged" -#gem "merged" , path: "../merged" +#gem "merged" , git: "https://github.com/HubFeenixMakers/merged" +gem "merged" , path: "../merged" gem "rails", "~> 7.0" diff --git a/Gemfile.lock b/Gemfile.lock index 11eee8e..c365ec6 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,6 +1,14 @@ GIT - remote: https://github.com/HubFeenixMakers/merged - revision: 78f47614fa2e160990f74b23c7e63d856d913655 + remote: https://github.com/ruby2js/ruby2js/ + revision: f204f4e8f14cde6e4d4c6aafc55251a8d488a78d + branch: haml_fix + specs: + ruby2js (5.0.1) + parser + regexp_parser (~> 2.1.1) + +PATH + remote: ../merged specs: merged (0.1.0) active_hash @@ -11,83 +19,74 @@ GIT redcarpet ruby2js (~> 5.0, >= 5.0.1) -GIT - remote: https://github.com/ruby2js/ruby2js/ - revision: f204f4e8f14cde6e4d4c6aafc55251a8d488a78d - branch: haml_fix - specs: - ruby2js (5.0.1) - parser - regexp_parser (~> 2.1.1) - GEM remote: https://rubygems.org/ specs: - actioncable (7.0.4.2) - actionpack (= 7.0.4.2) - activesupport (= 7.0.4.2) + actioncable (7.0.4.3) + actionpack (= 7.0.4.3) + activesupport (= 7.0.4.3) nio4r (~> 2.0) websocket-driver (>= 0.6.1) - actionmailbox (7.0.4.2) - actionpack (= 7.0.4.2) - activejob (= 7.0.4.2) - activerecord (= 7.0.4.2) - activestorage (= 7.0.4.2) - activesupport (= 7.0.4.2) + actionmailbox (7.0.4.3) + actionpack (= 7.0.4.3) + activejob (= 7.0.4.3) + activerecord (= 7.0.4.3) + activestorage (= 7.0.4.3) + activesupport (= 7.0.4.3) mail (>= 2.7.1) net-imap net-pop net-smtp - actionmailer (7.0.4.2) - actionpack (= 7.0.4.2) - actionview (= 7.0.4.2) - activejob (= 7.0.4.2) - activesupport (= 7.0.4.2) + actionmailer (7.0.4.3) + actionpack (= 7.0.4.3) + actionview (= 7.0.4.3) + activejob (= 7.0.4.3) + activesupport (= 7.0.4.3) mail (~> 2.5, >= 2.5.4) net-imap net-pop net-smtp rails-dom-testing (~> 2.0) - actionpack (7.0.4.2) - actionview (= 7.0.4.2) - activesupport (= 7.0.4.2) + actionpack (7.0.4.3) + actionview (= 7.0.4.3) + activesupport (= 7.0.4.3) rack (~> 2.0, >= 2.2.0) rack-test (>= 0.6.3) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.0, >= 1.2.0) - actiontext (7.0.4.2) - actionpack (= 7.0.4.2) - activerecord (= 7.0.4.2) - activestorage (= 7.0.4.2) - activesupport (= 7.0.4.2) + actiontext (7.0.4.3) + actionpack (= 7.0.4.3) + activerecord (= 7.0.4.3) + activestorage (= 7.0.4.3) + activesupport (= 7.0.4.3) globalid (>= 0.6.0) nokogiri (>= 1.8.5) - actionview (7.0.4.2) - activesupport (= 7.0.4.2) + actionview (7.0.4.3) + activesupport (= 7.0.4.3) builder (~> 3.1) erubi (~> 1.4) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.1, >= 1.2.0) - active_hash (3.1.1) + active_hash (3.2.0) activesupport (>= 5.0.0) active_record_union (1.3.0) activerecord (>= 4.0) - activejob (7.0.4.2) - activesupport (= 7.0.4.2) + activejob (7.0.4.3) + activesupport (= 7.0.4.3) globalid (>= 0.3.6) - activemodel (7.0.4.2) - activesupport (= 7.0.4.2) - activerecord (7.0.4.2) - activemodel (= 7.0.4.2) - activesupport (= 7.0.4.2) - activestorage (7.0.4.2) - actionpack (= 7.0.4.2) - activejob (= 7.0.4.2) - activerecord (= 7.0.4.2) - activesupport (= 7.0.4.2) + activemodel (7.0.4.3) + activesupport (= 7.0.4.3) + activerecord (7.0.4.3) + activemodel (= 7.0.4.3) + activesupport (= 7.0.4.3) + activestorage (7.0.4.3) + actionpack (= 7.0.4.3) + activejob (= 7.0.4.3) + activerecord (= 7.0.4.3) + activesupport (= 7.0.4.3) marcel (~> 1.0) mini_mime (>= 1.1.0) - activesupport (7.0.4.2) + activesupport (7.0.4.3) concurrent-ruby (~> 1.0, >= 1.0.2) i18n (>= 1.6, < 2) minitest (>= 5.1) @@ -123,7 +122,7 @@ GEM marcel (~> 1.0.0) ssrf_filter (~> 1.0) coderay (1.1.3) - concurrent-ruby (1.2.0) + concurrent-ruby (1.2.2) crass (1.0.6) date (3.3.3) db_text_search (1.0.0) @@ -147,7 +146,7 @@ GEM formatador (1.1.0) friendly_id (5.5.0) activerecord (>= 4.0.0) - git (1.13.2) + git (1.18.0) addressable (~> 2.8) rchardet (~> 1.8) globalid (1.1.0) @@ -185,7 +184,7 @@ GEM nokogiri (>= 1.6.0) ruby_parser (~> 3.5) htmlentities (4.3.4) - i18n (1.12.0) + i18n (1.13.0) concurrent-ruby (~> 1.0) image_processing (1.12.2) mini_magick (>= 4.9.5, < 5) @@ -218,9 +217,9 @@ GEM listen (3.7.1) rb-fsevent (~> 0.10, >= 0.10.3) rb-inotify (~> 0.9, >= 0.9.10) - loofah (2.19.1) + loofah (2.21.2) crass (~> 1.0.2) - nokogiri (>= 1.5.9) + nokogiri (>= 1.12.0) lumberjack (1.2.8) mail (2.8.1) mini_mime (>= 0.1.1) @@ -235,7 +234,7 @@ GEM rake mini_magick (4.12.0) mini_mime (1.1.2) - minitest (5.17.0) + minitest (5.18.0) msgpack (1.6.0) multi_json (1.15.0) mustache (1.1.1) @@ -249,8 +248,8 @@ GEM timeout net-smtp (0.3.3) net-protocol - nio4r (2.5.8) - nokogiri (1.14.2-x86_64-linux) + nio4r (2.5.9) + nokogiri (1.14.4-x86_64-linux) racc (~> 1.4) notiffany (0.1.3) nenv (~> 0.1) @@ -277,23 +276,23 @@ GEM pundit (2.3.0) activesupport (>= 3.0.0) racc (1.6.2) - rack (2.2.6.2) - rack-test (2.0.2) + rack (2.2.7) + rack-test (2.1.0) rack (>= 1.3) - rails (7.0.4.2) - actioncable (= 7.0.4.2) - actionmailbox (= 7.0.4.2) - actionmailer (= 7.0.4.2) - actionpack (= 7.0.4.2) - actiontext (= 7.0.4.2) - actionview (= 7.0.4.2) - activejob (= 7.0.4.2) - activemodel (= 7.0.4.2) - activerecord (= 7.0.4.2) - activestorage (= 7.0.4.2) - activesupport (= 7.0.4.2) + rails (7.0.4.3) + actioncable (= 7.0.4.3) + actionmailbox (= 7.0.4.3) + actionmailer (= 7.0.4.3) + actionpack (= 7.0.4.3) + actiontext (= 7.0.4.3) + actionview (= 7.0.4.3) + activejob (= 7.0.4.3) + activemodel (= 7.0.4.3) + activerecord (= 7.0.4.3) + activestorage (= 7.0.4.3) + activesupport (= 7.0.4.3) bundler (>= 1.15.0) - railties (= 7.0.4.2) + railties (= 7.0.4.3) rails-dom-testing (2.0.3) activesupport (>= 4.2.0) nokogiri (>= 1.6) @@ -301,9 +300,9 @@ GEM loofah (~> 2.19, >= 2.19.1) rails_gravatar (1.0.4) actionview - railties (7.0.4.2) - actionpack (= 7.0.4.2) - activesupport (= 7.0.4.2) + railties (7.0.4.3) + actionpack (= 7.0.4.3) + activesupport (= 7.0.4.3) method_source rake (>= 12.2) thor (~> 1.0) @@ -371,7 +370,7 @@ GEM tailwindcss-rails (2.0.21-x86_64-linux) railties (>= 6.0.0) temple (0.10.0) - thor (1.2.1) + thor (1.2.2) thredded (1.0.1) active_record_union (>= 1.3.0) autoprefixer-rails @@ -395,7 +394,7 @@ GEM timeago_js (>= 3.0.2.2) tilt (2.0.11) timeago_js (3.0.2.2) - timeout (0.3.1) + timeout (0.3.2) tzinfo (2.0.6) concurrent-ruby (~> 1.0) warden (1.2.9) @@ -415,7 +414,7 @@ GEM websocket-extensions (0.1.5) xpath (3.2.0) nokogiri (~> 1.8) - zeitwerk (2.6.7) + zeitwerk (2.6.8) PLATFORMS x86_64-linux diff --git a/app/assets/images/merged/1.webp b/app/assets/images/merged/1.webp deleted file mode 100644 index eeb1f54..0000000 Binary files a/app/assets/images/merged/1.webp and /dev/null differ diff --git a/app/assets/images/merged/60.jpg b/app/assets/images/merged/60.jpg deleted file mode 100644 index 59b0a19..0000000 Binary files a/app/assets/images/merged/60.jpg and /dev/null differ diff --git a/app/assets/images/merged/67.png b/app/assets/images/merged/67.png deleted file mode 100644 index 0e6097d..0000000 Binary files a/app/assets/images/merged/67.png and /dev/null differ diff --git a/app/assets/images/merged/74.jpg b/app/assets/images/merged/74.jpg deleted file mode 100644 index 1d42d75..0000000 Binary files a/app/assets/images/merged/74.jpg and /dev/null differ diff --git a/app/assets/images/merged/77.jpg b/app/assets/images/merged/77.jpg deleted file mode 100644 index 4481150..0000000 Binary files a/app/assets/images/merged/77.jpg and /dev/null differ diff --git a/app/assets/images/merged/79.jpg b/app/assets/images/merged/79.jpg deleted file mode 100644 index 2af0e66..0000000 Binary files a/app/assets/images/merged/79.jpg and /dev/null differ diff --git a/app/assets/images/merged/80.jpg b/app/assets/images/merged/80.jpg index fe4a330..1f0940b 100644 Binary files a/app/assets/images/merged/80.jpg and b/app/assets/images/merged/80.jpg differ diff --git a/app/assets/images/merged/89.jpg b/app/assets/images/merged/89.jpg index fc0e93f..9e31bee 100644 Binary files a/app/assets/images/merged/89.jpg and b/app/assets/images/merged/89.jpg differ diff --git a/app/assets/images/merged/91.jpg b/app/assets/images/merged/91.jpg index 0b350a0..179abea 100644 Binary files a/app/assets/images/merged/91.jpg and b/app/assets/images/merged/91.jpg differ diff --git a/merged/images.yml b/merged/images.yml index 23b10af..407a21b 100644 --- a/merged/images.yml +++ b/merged/images.yml @@ -1,12 +1,4 @@ --- -- :name: 3dprinter - :type: webp - :width: 1279 - :height: 457 - :created_at: 2022-12-07 14:26:04.321730558 +02:00 - :size: 63 - :id: 1 - :tags: wide - :name: Cafe about :type: webp :width: 2698 @@ -523,24 +515,15 @@ :id: 59 :updated_at: 2023-01-25 16:24:43.990281723 +02:00 :updated_by: torsten@villataika.fi -- :name: winter-in-helsinki-1024x682 - :type: jpg - :tags: '' - :width: 1024 - :height: 682 - :size: 137 - :id: 60 - :updated_at: 2023-02-13 11:02:28.121774642 +02:00 - :updated_by: maijanposteja@gmail.com -- :name: STA0470_VR_SMX_web +- :name: train :type: jpg :tags: '' :width: 810 :height: 540 :size: 586 :id: 61 - :updated_at: 2023-02-13 12:49:42.401779722 +02:00 - :updated_by: maijanposteja@gmail.com + :updated_at: 2023-05-14 16:24:51.779942799 +03:00 + :updated_by: torsten@villataika.fi - :name: thingshelsinki3 :type: jpg :tags: '' @@ -577,24 +560,15 @@ :id: 65 :updated_at: 2023-02-13 16:50:41.154614963 +02:00 :updated_by: maijanposteja@gmail.com -- :name: Panorama-Of-Embankment-In-Hels-78444872q +- :name: Panorama-Of-Embankment :type: jpg - :tags: '' + :tags: helsinki :width: 1453 :height: 799 :size: 160 :id: 66 - :updated_at: 2023-02-13 13:19:05.621703682 +02:00 - :updated_by: maijanposteja@gmail.com -- :name: cce2ee4aa32adb2c632c2ebcac91de32-2519885935 - :type: png - :tags: '' - :width: 1513 - :height: 553 - :size: 1105 - :id: 67 - :updated_at: 2023-02-13 13:20:47.881387948 +02:00 - :updated_by: maijanposteja@gmail.com + :updated_at: 2023-05-14 16:21:49.654167516 +03:00 + :updated_by: torsten@villataika.fi - :name: Old-Market-Hall :type: jpg :tags: '' @@ -613,15 +587,15 @@ :id: 69 :updated_at: 2023-02-13 13:28:36.636536199 +02:00 :updated_by: maijanposteja@gmail.com -- :name: _mg_8294 +- :name: cottage :type: jpg :tags: '' :width: 739 :height: 493 :size: 72 :id: 70 - :updated_at: 2023-02-13 17:04:43.570262012 +02:00 - :updated_by: maijanposteja@gmail.com + :updated_at: 2023-05-14 16:22:57.638907581 +03:00 + :updated_by: torsten@villataika.fi - :name: Temppeliaukio-Church :type: jpg :tags: '' @@ -640,24 +614,15 @@ :id: 72 :updated_at: 2023-02-13 17:06:04.418529968 +02:00 :updated_by: maijanposteja@gmail.com -- :name: upload-1559614166256 +- :name: railway_station_helsinki :type: jpg :tags: '' :width: 1244 :height: 829 :size: 247 :id: 73 - :updated_at: 2023-02-13 17:12:04.727790195 +02:00 - :updated_by: maijanposteja@gmail.com -- :name: kiasma_generic - :type: jpg - :tags: '' - :width: 924 - :height: 616 - :size: 77 - :id: 74 - :updated_at: 2023-02-13 17:07:20.519108692 +02:00 - :updated_by: maijanposteja@gmail.com + :updated_at: 2023-05-14 16:18:45.695805973 +03:00 + :updated_by: torsten@villataika.fi - :name: ba :type: jpg :tags: '' @@ -676,15 +641,6 @@ :id: 76 :updated_at: 2023-02-13 17:09:18.885604762 +02:00 :updated_by: maijanposteja@gmail.com -- :name: 100-syyta - :type: jpg - :tags: '' - :width: 958 - :height: 616 - :size: 103 - :id: 77 - :updated_at: 2023-02-14 09:38:57.257723123 +02:00 - :updated_by: maijanposteja@gmail.com - :name: taustakuvasyksy :type: jpg :tags: '' @@ -694,24 +650,15 @@ :id: 78 :updated_at: 2023-02-14 09:47:53.860276146 +02:00 :updated_by: maijanposteja@gmail.com -- :name: TBR_verkkosivut_talvi_2022_Tuomiokirkko +- :name: talvi :type: jpg - :tags: '' - :width: 1647 - :height: 625 - :size: 106 - :id: 79 - :updated_at: 2023-02-14 09:50:43.226327136 +02:00 - :updated_by: maijanposteja@gmail.com -- :name: TBR_verkkosivut_talvi_2022_Tuomiokirkko - :type: jpg - :tags: '' - :width: 2001 - :height: 1333 - :size: 508 + :tags: hel + :width: 1527 + :height: 1017 + :size: 333 :id: 80 - :updated_at: 2023-02-14 09:51:24.013535421 +02:00 - :updated_by: maijanposteja@gmail.com + :updated_at: 2023-05-14 16:24:43.553093772 +03:00 + :updated_by: torsten@villataika.fi - :name: Turku-Castle :type: jpg :tags: '' @@ -721,60 +668,60 @@ :id: 81 :updated_at: 2023-02-14 10:12:32.150062940 +02:00 :updated_by: maijanposteja@gmail.com -- :name: IMG_1303-183633942 +- :name: Turku Cathedral :type: jpg - :tags: '' + :tags: turku :width: 1024 :height: 683 :size: 182 :id: 82 - :updated_at: 2023-02-14 10:17:27.550528265 +02:00 - :updated_by: maijanposteja@gmail.com -- :name: linna1-2664144569 + :updated_at: 2023-05-14 16:21:16.824212667 +03:00 + :updated_by: torsten@villataika.fi +- :name: linna1 :type: jpg :tags: '' :width: 1496 :height: 997 :size: 203 :id: 83 - :updated_at: 2023-02-14 10:19:53.125235667 +02:00 - :updated_by: maijanposteja@gmail.com -- :name: c6afbe11-f645-4723-b292-6e71606ae64a-istock-696019316-58238522 + :updated_at: 2023-05-14 16:20:59.791445095 +03:00 + :updated_by: torsten@villataika.fi +- :name: art museum :type: jpg - :tags: '' + :tags: turku :width: 1134 :height: 756 :size: 131 :id: 84 - :updated_at: 2023-02-14 10:47:31.635379473 +02:00 - :updated_by: maijanposteja@gmail.com -- :name: pharmacy-museum-and-qwensel-house-turku-2904441528 + :updated_at: 2023-05-14 16:23:24.706577616 +03:00 + :updated_by: torsten@villataika.fi +- :name: pharmacy-museum :type: jpg - :tags: '' + :tags: turku :width: 1400 :height: 933 :size: 86 :id: 85 - :updated_at: 2023-02-14 10:26:00.059923073 +02:00 - :updated_by: maijanposteja@gmail.com -- :name: luostarinmaki_6-2529200810 + :updated_at: 2023-05-14 16:23:48.393689268 +03:00 + :updated_by: torsten@villataika.fi +- :name: luostarinmaki :type: jpg :tags: '' :width: 1136 :height: 757 :size: 283 :id: 86 - :updated_at: 2023-02-14 10:29:52.688013407 +02:00 - :updated_by: maijanposteja@gmail.com -- :name: aerial-view-ruissalo-island-turku-finland-nordic-natural-landscape-photo-made-drone-above-155508565-289270161 + :updated_at: 2023-05-14 16:20:47.507618275 +03:00 + :updated_by: torsten@villataika.fi +- :name: aerial-view-ruissalo :type: jpg - :tags: '' + :tags: turku :width: 800 :height: 533 :size: 67 :id: 87 - :updated_at: 2023-02-14 10:33:26.830511379 +02:00 - :updated_by: maijanposteja@gmail.com + :updated_at: 2023-05-14 16:22:00.143612021 +03:00 + :updated_by: torsten@villataika.fi - :name: featured-image-896175141 :type: jpg :tags: '' @@ -784,15 +731,15 @@ :id: 88 :updated_at: 2023-02-14 10:48:31.707664043 +02:00 :updated_by: maijanposteja@gmail.com -- :name: Turku_Archipelago_3_-Finland +- :name: Archipelago :type: jpg - :tags: '' - :width: 2000 - :height: 1339 - :size: 372 + :tags: turku + :width: 1424 + :height: 953 + :size: 452 :id: 89 - :updated_at: 2023-02-14 10:42:18.537589661 +02:00 - :updated_by: maijanposteja@gmail.com + :updated_at: 2023-05-14 16:24:11.574563066 +03:00 + :updated_by: torsten@villataika.fi - :name: Aurajoki,_Turku_2 :type: jpg :tags: '' @@ -802,15 +749,15 @@ :id: 90 :updated_at: 2023-02-14 10:47:05.172097786 +02:00 :updated_by: maijanposteja@gmail.com -- :name: kauppahallit_turku11_KnP92 +- :name: kauppahallit :type: jpg - :tags: '' - :width: 2112 - :height: 1408 - :size: 3192 + :tags: turku + :width: 1630 + :height: 1087 + :size: 2092 :id: 91 - :updated_at: 2023-02-14 10:46:36.337753613 +02:00 - :updated_by: maijanposteja@gmail.com + :updated_at: 2023-05-14 16:24:26.680117669 +03:00 + :updated_by: torsten@villataika.fi - :name: '0' :type: jpg :tags: '' @@ -847,102 +794,102 @@ :id: 95 :updated_at: 2023-02-14 13:38:25.777977003 +02:00 :updated_by: maijanposteja@gmail.com -- :name: zucchini-vegetarian-restaurants-helsinki-5-933x700 +- :name: zucchini-vegetarian-restaurants :type: jpg - :tags: '' + :tags: helsinki :width: 933 :height: 700 :size: 159 :id: 96 - :updated_at: 2023-02-14 13:45:48.322105329 +02:00 - :updated_by: maijanposteja@gmail.com -- :name: hcmp17411_246684 + :updated_at: 2023-05-14 16:22:10.854293036 +03:00 + :updated_by: torsten@villataika.fi +- :name: bread :type: jpg - :tags: '' + :tags: food :width: 1024 :height: 1024 :size: 332 :id: 97 - :updated_at: 2023-02-14 13:50:36.341568422 +02:00 - :updated_by: maijanposteja@gmail.com -- :name: FOODHELSINKI-11-of-17-689x861 + :updated_at: 2023-05-14 16:20:21.541729803 +03:00 + :updated_by: torsten@villataika.fi +- :name: FOODHELSINKI :type: jpg - :tags: '' + :tags: helsinki :width: 689 :height: 861 :size: 45 :id: 98 - :updated_at: 2023-02-14 13:54:16.688599475 +02:00 - :updated_by: maijanposteja@gmail.com -- :name: cafetoria-roastery-helsinkni-social-media-4 + :updated_at: 2023-05-14 16:23:33.776614141 +03:00 + :updated_by: torsten@villataika.fi +- :name: cafetoria-roastery :type: jpg - :tags: '' + :tags: helsinki :width: 1080 :height: 1080 :size: 90 :id: 99 - :updated_at: 2023-02-14 14:04:46.487821829 +02:00 - :updated_by: maijanposteja@gmail.com -- :name: image1-3083950314 + :updated_at: 2023-05-14 16:23:09.416353634 +03:00 + :updated_by: torsten@villataika.fi +- :name: burger :type: jpg - :tags: '' + :tags: food :width: 480 :height: 640 :size: 116 :id: 100 - :updated_at: 2023-02-14 14:43:41.961112654 +02:00 - :updated_by: maijanposteja@gmail.com -- :name: cafeartkahvia-44230635 + :updated_at: 2023-05-14 16:22:26.722492971 +03:00 + :updated_by: torsten@villataika.fi +- :name: cafeartkahvia :type: jpg - :tags: '' + :tags: food :width: 900 :height: 600 :size: 54 :id: 101 - :updated_at: 2023-02-14 15:56:10.781214412 +02:00 - :updated_by: maijanposteja@gmail.com -- :name: zzzz-13-2803465492 + :updated_at: 2023-05-14 16:19:09.417911860 +03:00 + :updated_by: torsten@villataika.fi +- :name: baguette :type: jpg - :tags: '' + :tags: food :width: 944 :height: 629 :size: 100 :id: 102 - :updated_at: 2023-02-14 15:27:03.829460353 +02:00 - :updated_by: maijanposteja@gmail.com -- :name: ba96f66c-d9a2-11eb-a023-bab400a0d909_ff365534_bd27_11eb_b9cd_8ec291b05929_1t8c1147-2817832838 + :updated_at: 2023-05-14 16:19:38.965605947 +03:00 + :updated_by: torsten@villataika.fi +- :name: soup :type: jpg - :tags: '' + :tags: food :width: 1013 :height: 675 :size: 123 :id: 103 - :updated_at: 2023-02-14 15:29:17.751937386 +02:00 - :updated_by: maijanposteja@gmail.com -- :name: zzzz0-2-4175505208 + :updated_at: 2023-05-14 16:19:27.057267463 +03:00 + :updated_by: torsten@villataika.fi +- :name: cake :type: jpg - :tags: '' + :tags: food :width: 960 :height: 640 :size: 135 :id: 104 - :updated_at: 2023-02-14 15:57:41.238356182 +02:00 - :updated_by: maijanposteja@gmail.com -- :name: 1281d114-3861-11eb-9967-468ed5800ab0_ppp02754-1846474467 + :updated_at: 2023-05-14 16:18:55.292984822 +03:00 + :updated_by: torsten@villataika.fi +- :name: pizza :type: jpg - :tags: '' + :tags: food :width: 1013 :height: 675 :size: 133 :id: 105 - :updated_at: 2023-02-14 15:58:40.815301102 +02:00 - :updated_by: maijanposteja@gmail.com -- :name: tinta_salad_turku-2594473041 + :updated_at: 2023-05-14 16:16:57.744493276 +03:00 + :updated_by: torsten@villataika.fi +- :name: tinta_salad_turku :type: jpg - :tags: '' + :tags: food :width: 650 :height: 449 :size: 33 :id: 106 - :updated_at: 2023-02-14 15:43:19.961175392 +02:00 - :updated_by: maijanposteja@gmail.com + :updated_at: 2023-05-14 16:19:18.138916444 +03:00 + :updated_by: torsten@villataika.fi diff --git a/merged/sections.yml b/merged/sections.yml index c6045d0..fa8fbdb 100644 --- a/merged/sections.yml +++ b/merged/sections.yml @@ -289,9 +289,9 @@ from Helsinki: approximately 1 hour by train or car (75 km)\r\n\r\n[see on google maps](https://www.google.com/maps/place/Hub+Feenix/@60.1087256,23.7915169,17z/data=!3m1!4b1!4m5!3m4!1s0x468da5124a023e29:0xcae080e9021c7724!8m2!3d60.1087229!4d23.7937056)\r\n\r\n\r\n" - :template: section_cards - :index: 1 + :index: 2 :page_id: 5 - :updated_at: 2023-02-15 14:10:58.856862168 +02:00 + :updated_at: 2023-05-14 16:12:09.437940013 +03:00 :updated_by: torsten@villataika.fi :id: 15 :card_template: card_full_image