Skip to content

Commit

Permalink
Merge branch 'main' into rust_module_hello
Browse files Browse the repository at this point in the history
  • Loading branch information
trbutler4 committed Sep 2, 2024
2 parents 7b2ce0e + 82963f1 commit f40ad94
Show file tree
Hide file tree
Showing 26 changed files with 1,336 additions and 83 deletions.
3 changes: 2 additions & 1 deletion .all-contributorsrc
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,8 @@
"avatar_url": "https://avatars.githubusercontent.com/u/5482929?v=4",
"profile": "https://github.com/lauchaves",
"contributions": [
"design"
"design",
"code"
]
}
],
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ We live on contributions. If you'd like to contribute please follow the [guide](
<td align="center" valign="top" width="14.28%"><a href="https://github.com/Oshioke-Salaki"><img src="https://avatars.githubusercontent.com/u/105825121?v=4?s=100" width="100px;" alt="Oshioke Salaki"/><br /><sub><b>Oshioke Salaki</b></sub></a><br /><a href="https://github.com/keep-starknet-strange/starknet-phone/commits?author=Oshioke-Salaki" title="Code">💻</a></td>
<td align="center" valign="top" width="14.28%"><a href="https://github.com/sajalbnl"><img src="https://avatars.githubusercontent.com/u/77548932?v=4?s=100" width="100px;" alt="Sajal bansal"/><br /><sub><b>Sajal bansal</b></sub></a><br /><a href="https://github.com/keep-starknet-strange/starknet-phone/commits?author=sajalbnl" title="Code">💻</a></td>
<td align="center" valign="top" width="14.28%"><a href="https://github.com/Gerson2102"><img src="https://avatars.githubusercontent.com/u/71728860?v=4?s=100" width="100px;" alt="Gerson"/><br /><sub><b>Gerson</b></sub></a><br /><a href="https://github.com/keep-starknet-strange/starknet-phone/commits?author=Gerson2102" title="Code">💻</a></td>
<td align="center" valign="top" width="14.28%"><a href="https://github.com/lauchaves"><img src="https://avatars.githubusercontent.com/u/5482929?v=4?s=100" width="100px;" alt="Lau Chaves"/><br /><sub><b>Lau Chaves</b></sub></a><br /><a href="#design-lauchaves" title="Design">🎨</a></td>
<td align="center" valign="top" width="14.28%"><a href="https://github.com/lauchaves"><img src="https://avatars.githubusercontent.com/u/5482929?v=4?s=100" width="100px;" alt="Lau Chaves"/><br /><sub><b>Lau Chaves</b></sub></a><br /><a href="#design-lauchaves" title="Design">🎨</a> <a href="https://github.com/keep-starknet-strange/starknet-phone/commits?author=lauchaves" title="Code">💻</a></td>
</tr>
</tbody>
</table>
Expand Down
66 changes: 66 additions & 0 deletions wallet_app/android/.idea/other.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 3 additions & 0 deletions wallet_app/android/app/.idea/.gitignore

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions wallet_app/android/app/.idea/.name

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

13 changes: 13 additions & 0 deletions wallet_app/android/app/.idea/gradle.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

10 changes: 10 additions & 0 deletions wallet_app/android/app/.idea/migrations.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

10 changes: 10 additions & 0 deletions wallet_app/android/app/.idea/misc.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit f40ad94

Please sign in to comment.