Merge remote-tracking branch 'origin/feat/12-hours-polls' into feat/merge-commits

2023-11-08 18:39:04 +01:00
parent d8b932c9ad 4a58fae111
commit f1a5e3afae
1 changed files with 1 additions and 0 deletions
--- a/mastodon/src/main/java/org/joinmastodon/android/ui/viewcontrollers/ComposePollViewController.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/ui/viewcontrollers/ComposePollViewController.java
@@ -42,6 +42,7 @@ public class ComposePollViewController{
 			30*60,
 			3600,
 			6*3600,
+			12*3600,
 			24*3600,
 			3*24*3600,
 			7*24*3600,