Commit Graph

5 Commits

Author SHA1 Message Date
LucasGGamerM 64e681c227 Merge remote-tracking branch 'megalodon_main/main'
# Conflicts:
#	mastodon/build.gradle
#	mastodon/src/main/java/org/joinmastodon/android/GlobalUserPreferences.java
#	mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/FooterStatusDisplayItem.java
#	mastodon/src/main/java/org/joinmastodon/android/ui/utils/UiUtils.java
#	metadata/de-DE/changelogs/83.txt
#	metadata/en-US/changelogs/83.txt
2023-04-12 13:04:31 -03:00
sk eadb62d3a8 fix wrong rel=me link on website 2023-04-06 20:16:26 +02:00
LucasGGamerM 0a68f86200
Update default.html 2022-12-21 19:50:47 -03:00
sk 6e52ebc299 rebranding 2022-11-24 20:37:04 +01:00
sk 7e4169644d update website 2022-11-21 23:11:33 +01:00