Merge remote-tracking branch 'megalodon_main/main'

# Conflicts:
#	mastodon/src/main/java/org/joinmastodon/android/fragments/BaseStatusListFragment.java
#	mastodon/src/main/java/org/joinmastodon/android/fragments/HomeTabFragment.java
#	mastodon/src/main/java/org/joinmastodon/android/fragments/ProfileFragment.java
#	mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/StatusDisplayItem.java

mastodon/src/main/java/org/joinmastodon/android/model/Notification.java

@@ -53,12 +53,14 @@ public class Notification extends BaseModel implements DisplayItemsParent{
 		STATUS,
 		@SerializedName("update")
 		UPDATE,
+		@SerializedName("reaction")
+		REACTION,
+		@SerializedName("pleroma:emoji_reaction")
+		PLEROMA_EMOJI_REACTION,
 		@SerializedName("admin.sign_up")
 		SIGN_UP,
 		@SerializedName("admin.report")
-		REPORT,
-		@SerializedName("pleroma:emoji_reaction")
-		EMOJI_REACTION
+		REPORT
 	}
 
 	@Parcel