diff options
| author | HJ <30-hj@users.noreply.git.pleroma.social> | 2019-03-27 08:51:35 +0000 |
|---|---|---|
| committer | HJ <30-hj@users.noreply.git.pleroma.social> | 2019-03-27 08:51:35 +0000 |
| commit | 96753e6a5febff60e0c2cb6fac13d5e7865f0a94 (patch) | |
| tree | fffb162b2f2a8d923ac8abc2fc07c86c5efdc5f8 /src/components/notifications/notifications.vue | |
| parent | 987b5162a7530979e9fa887a24311eb1cd480fc5 (diff) | |
| parent | 95459ff0bca7f095f0fdc01b38dd89626fe5c189 (diff) | |
Merge branch 'revert-987b5162' into 'develop'
Revert "Merge branch 'mastoapi/friends-tl' into 'develop'"
See merge request pleroma/pleroma-fe!710
Diffstat (limited to 'src/components/notifications/notifications.vue')
0 files changed, 0 insertions, 0 deletions