Skip to content

Commit

Permalink
fixed merge conflict
Browse files Browse the repository at this point in the history
  • Loading branch information
stephenjude committed Nov 5, 2024
2 parents bd6b512 + e4f1ded commit 397a5bd
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 5 deletions.
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,10 @@

All notable changes to `filament-jetstream` will be documented in this file.

## 0.0.13 - 2024-08-03

- Fixed duplicate team creation during user registration

## 0.0.12 - 2024-06-20

- Fixed user profile URL bug
Expand Down
12 changes: 7 additions & 5 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
![Edit Profile](https://raw.githubusercontent.com/stephenjude/filament-jetstream/main/art/banner.jpg)

# Filament Jetstream

[![Latest Version on Packagist](https://img.shields.io/packagist/v/stephenjude/filament-jetstream.svg?style=flat-square)](https://packagist.org/packages/stephenjude/filament-jetstream)
Expand Down Expand Up @@ -31,23 +33,23 @@ You can remove the `--teams` and `--api` arguments if you don't want those featu

## Screenshots

![Profile](art/profile.jpeg)
![Edit Profile](https://raw.githubusercontent.com/stephenjude/filament-jetstream/main/art/profile_1.png)

---

![Team](art/team.jpeg)
![Edit Profile](https://raw.githubusercontent.com/stephenjude/filament-jetstream/main/art/profile_2.png)

---

![Edit Team](art/api_token.jpeg)
![Edit Team](https://raw.githubusercontent.com/stephenjude/filament-jetstream/main/art/team_1.png)

---

![Edit Team](art/team_2.png)
![Edit Team](https://raw.githubusercontent.com/stephenjude/filament-jetstream/main/art/team_2.png)

---

![Edit Team](art/api_token.png)
![Edit Team](https://raw.githubusercontent.com/stephenjude/filament-jetstream/main/art/api_token.png)

## Testing

Expand Down
Binary file added art/banner.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

0 comments on commit 397a5bd

Please sign in to comment.