Skip to content

Commit

Permalink
chore(merge conflicts): resolved
Browse files Browse the repository at this point in the history
  • Loading branch information
Jonnx committed Dec 16, 2023
2 parents ab9c6f9 + b984a32 commit d2bc23f
Show file tree
Hide file tree
Showing 6 changed files with 249 additions and 166 deletions.
7 changes: 7 additions & 0 deletions CHANGELOG.md
@@ -1,3 +1,10 @@
# [1.51.0](https://github.com/mapmarker/mapmarker.io/compare/1.50.1...1.51.0) (2023-12-16)


### Features

* **homepage:** added more users to the homepage ([4a1bdb9](https://github.com/mapmarker/mapmarker.io/commit/4a1bdb91e875974104cf461f332f776892aa0205))

## [1.50.1](https://github.com/mapmarker/mapmarker.io/compare/1.50.0...1.50.1) (2023-12-16)


Expand Down
2 changes: 1 addition & 1 deletion composer.json
Expand Up @@ -68,5 +68,5 @@
},
"minimum-stability": "dev",
"prefer-stable": true,
"version": "1.50.1"
"version": "1.51.0"
}
2 changes: 1 addition & 1 deletion package.json
Expand Up @@ -3,7 +3,7 @@
"description": "generate complex map markers on the fly",
"homepage": "https://www.mapmarker.io",
"license": "MIT",
"version": "1.50.1",
"version": "1.51.0",
"scripts": {
"pint": "./vendor/bin/pint",
"style": "yarn pint -v --test",
Expand Down
2 changes: 1 addition & 1 deletion public/css/app.css

Large diffs are not rendered by default.

3 changes: 1 addition & 2 deletions resources/views/layouts/app-nav.blade.php
Expand Up @@ -53,8 +53,7 @@ class="text-gray-300 hover:bg-gray-700 hover:text-white px-3 py-2 rounded-md tex
class="absolute inset-y-0 right-0 flex items-center pr-2 sm:static sm:inset-auto sm:ml-6 sm:pr-0 text-gray-400 font-bold">
<a href="https://github.com/mapmarker" target="_blank"
class="text-gray-300 hover:bg-gray-700 hover:text-white block px-3 py-2 rounded-md text-base font-black">
<img src="https://mapmarker.io/api/v2/font-awesome/v5/icon?icon=fa-github&size=80&color=fff" /
alt="Github Logo" width="30" height="30" />
<img src="https://mapmarker.io/api/v2/font-awesome/v5/icon?icon=fa-github&size=80&color=fff" alt="Github Logo" width="30" height="30" />
<span class="sr-only">View Source Code</span>
</a>
<a href="/changelog"
Expand Down

0 comments on commit d2bc23f

Please sign in to comment.