Merge branch 'develop' into feature/return-to-starting-point-button

Merge pull request 'fix typo' (#29) from feature/modify-author into develop
Reviewed-on: https://gitea.e5tv.hu/esoko/mapguesser/pulls/29
2021-04-29 08:25:52 +02:00 · 2021-04-29 00:58:57 +02:00 · 2021-04-29 00:58:20 +02:00 · 2021-04-29 00:53:26 +02:00 · 2021-04-29 00:52:46 +02:00
2 changed files with 2 additions and 2 deletions
--- a/multi/package.json
+++ b/multi/package.json
@ -8,6 +8,6 @@
        "ws": "^7.4.4"
    },
    "scripts": {},
-    "author": "Pőcze Bence <bence@pocze.ch>",
+    "author": "Pőcze Bence and The MapGuesser Contributors <bence@pocze.ch>",
    "license": "GNU AGPL 3.0"
 }
--- a/views/templates/layout_normal.php
+++ b/views/templates/layout_normal.php
@ -29,6 +29,6 @@
 </main>
 <footer>
    <p><span class="bold"><?= $_ENV['APP_NAME'] ?></span> <?= str_replace('Release_', '', VERSION) ?></p><!--
- --><p>&copy; Pőcze Bence <?= (new DateTime(REVISION_DATE))->format('Y') ?></p>
+ --><p>&copy; The MapGuesser Contributors <?= (new DateTime(REVISION_DATE))->format('Y') ?></p>
 </footer>
@endsection
Author	SHA1	Message	Date
Balázs Vigh	f0b0de405c	Merge branch 'develop' into feature/return-to-starting-point-button All checks were successful default-pipeline default-pipeline #138 Details	2021-04-29 08:25:52 +02:00
Pőcze Bence	58cdc1be8d	Merge pull request 'fix typo' (#29) from feature/modify-author into develop All checks were successful default-pipeline default-pipeline #134 Details Reviewed-on: https://gitea.e5tv.hu/esoko/mapguesser/pulls/29	2021-04-29 00:58:57 +02:00
Pőcze Bence	4039202268	fix typo All checks were successful default-pipeline default-pipeline #133 Details	2021-04-29 00:58:20 +02:00
Pőcze Bence	4677cc5229	Merge pull request 'generalize author attribution' (#28) from feature/modify-author into develop All checks were successful default-pipeline default-pipeline #131 Details Reviewed-on: https://gitea.e5tv.hu/esoko/mapguesser/pulls/28	2021-04-29 00:53:26 +02:00
Pőcze Bence	8800724aa9	generalize author attribution All checks were successful default-pipeline default-pipeline #130 Details	2021-04-29 00:52:46 +02:00