Merge remote-tracking branch 'upstream/master'

2023-01-21 02:25:44 +01:00
parent 88851a085e 6e718d6765
commit ec40488ed1
10 changed files with 286 additions and 6 deletions
--- a/mastodon/src/main/java/org/joinmastodon/android/model/PushSubscription.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/model/PushSubscription.java
@@ -23,6 +23,7 @@ public class PushSubscription extends BaseModel implements Cloneable{
 				", endpoint='"+endpoint+'\''+
 				", alerts="+alerts+
 				", serverKey='"+serverKey+'\''+
+				", policy="+policy+
 				'}';
 	}