Alex Gleason
|
80891e83d8
|
Merge remote-tracking branch 'upstream/develop' into registration-workflow
|
2020-12-17 09:05:36 -06:00 |
|
lain
|
1436a2fa2d
|
Merge branch 'stream-follow-updates' into 'develop'
Stream follow updates
Closes #2299
See merge request pleroma/pleroma!3183
|
2020-12-09 15:52:31 +00:00 |
|
Mark Felder
|
657002e738
|
Answer new prompt interactively
|
2020-12-04 12:07:23 -06:00 |
|
Egor Kislitsyn
|
35ba48494f
|
Stream follow updates
|
2020-12-02 00:18:58 +04:00 |
|
Alex Gleason
|
9546c1444c
|
Merge remote-tracking branch 'upstream/develop' into registration-workflow
|
2020-11-14 19:48:47 -06:00 |
|
Alex Gleason
|
dc38dc8472
|
Replace User.toggle_confirmation/1 with User.confirm/1, fixes #2235
|
2020-10-13 22:01:27 -05:00 |
|
Mark Felder
|
09be8cb336
|
Credo
|
2020-10-13 12:49:43 -05:00 |
|
Mark Felder
|
409f694e4f
|
Merge branch 'develop' into refactor/locked_user_field
|
2020-10-13 09:54:29 -05:00 |
|
Alexander Strizhakov
|
6bf85440b3
|
mix tasks consistency
|
2020-10-13 16:33:24 +03:00 |