Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop
[akkoma] / installation / init.d /
2019-04-17 rinpatchMerge branch 'develop' into feature/database-compaction
2019-04-12 lambdaMerge branch 'ssl_trusted_cert' into 'develop'
2019-02-17 Ivan Tashkinov[#468] Merged `upstream/develop`, resolved conflicts.
2019-02-14 Wim VanderbauwhedeMerge remote-tracking branch 'upstream/develop' into...
2019-02-11 Karen KonouMerge branch 'develop' into feature/thread-muting
2019-02-11 Egor KislitsynMerge branch 'develop' of git.pleroma.social:pleroma...
2019-02-10 kaniiniMerge branch 'update-mastofe/glitch-soc-2019-02-10...
2019-02-10 kaniiniMerge branch 'feather_mention' into 'develop'
2019-02-10 kaniiniMerge branch 'fix/credo-issues' into 'develop'
2019-02-10 kaniiniMerge branch 'update-service-files-of-openrc-and-system...
2019-02-10 shibayashiUpdate service files of OpenRC and systemd to new recom...
2019-01-31 kaniiniMerge branch 'spc-fix-3' into 'develop'
2019-01-31 HaelwennMerge branch 'features/glitch-soc-frontend' into 'develop'
2019-01-31 Egor KislitsynMerge remote-tracking branch 'MAIN/develop' into featur...
2019-01-29 kaniiniMerge branch 'hj-happiness-improvement' into 'develop'
2019-01-29 HaelwennMerge branch 'feature/rich-media-part-2-electric-boogal...
2019-01-28 Ivan Tashkinov[#534] Merged `upstream/develop`.
2019-01-28 HaelwennMerge branch 'safe-render-activities' into 'develop'
2019-01-28 HaelwennMerge branch 'patch-2' into 'develop'
2019-01-28 vaartisUpdate the openrc service's retry with the correct...
2018-12-01 rinpatchAttempt to resolve merge conflict
2018-09-02 kaniiniMerge branch 'hotfix_broken_likes' into 'develop'
2018-08-27 lambdaMerge branch 'bugfix/announce-timeline-flooding' into...
2018-08-26 kaniiniMerge branch 'feature/emoji-in-local-users' into 'develop'
2018-08-26 kaniiniMerge branch 'develop' into 'feature/relay'
2018-08-24 kaniiniMerge branch 'bugfix/formatter-single-char-nicks' into...
2018-08-24 kaniiniMerge branch 'config/fe-collapse-subject' into 'develop'
2018-08-23 kaniiniMerge branch 'fix/suggestions-api-error-handling' into...
2018-08-23 HaelwennMerge branch 'develop' into 'develop'
2018-08-23 vaartisAdd an OpenRC service