Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop
[akkoma] / COPYING
2019-06-03 Mark FelderMerge branch 'develop' into update-oauth-template
2019-05-29 Roman ChvanikovMerge develop
2019-05-18 rinpatchResolve merge conflicts and remove IO.inspects
2019-05-17 lainMerge branch 'develop' of git.pleroma.social:pleroma...
2019-05-16 sadposterMerge branch 'develop' of https://git.pleroma.social...
2019-05-15 lainMerge remote-tracking branch 'origin/develop' into...
2019-05-14 Egor KislitsynMerge remote-tracking branch 'pleroma/develop' into...
2019-05-14 Egor KislitsynMerge remote-tracking branch 'pleroma/develop' into...
2019-05-13 lambdaMerge branch 'feature/federator-behaviours' into 'develop'
2019-05-13 lambdaMerge branch 'mascot/pleroma-tan-shy' into 'develop'
2019-05-12 Haelwenn (lanodan... pleroma-fox-tan-shy.png: Add another version of pleroma-tan
2019-05-04 lainMerge remote-tracking branch 'origin/develop' into...
2019-05-01 Mark FelderMerge branch 'develop' into update-oauth-template
2019-05-01 lainMerge remote-tracking branch 'origin/develop' into...
2019-05-01 lambdaMerge branch 'features/download-mastofe-build' into...
2019-05-01 Alex SMerging with develop
2019-04-30 Roman ChvanikovMerge develop
2019-04-29 SadposterMerge branch 'develop' of https://git.pleroma.social...
2019-04-23 kaniiniMerge branch 'security/fix-html-class-scrubbing' into...
2019-04-22 Egor KislitsynMerge remote-tracking branch 'pleroma/develop' into...
2019-04-22 kaniiniMerge branch 'rework-emoji-management' into 'develop'
2019-04-20 Ekaterina VaartisRemove most finmoji mentions where appropriate
2019-04-17 rinpatchMerge branch 'develop' into feature/database-compaction
2019-04-12 lambdaMerge branch 'features/mastoapi/2.6.0-min_id-pagination...
2019-04-12 lambdaMerge branch 'fix/732-password-align' into 'develop'
2019-04-12 lambdaMerge branch 'ssl_trusted_cert' into 'develop'
2019-04-11 Egor KislitsynMerge remote-tracking branch 'pleroma/develop' into...
2019-04-10 kaniiniMerge branch 'notification-pleroma-settings' into ...
2019-04-08 lainMerge remote-tracking branch 'origin/develop' into...
2019-04-04 Ivan Tashkinov[#923] Merge remote-tracking branch 'remotes/upstream...
2019-04-04 SadposterMerge branch 'develop' of https://git.pleroma.social...
2019-04-02 lambdaMerge branch 'bugfix/wrong-date-format' into 'develop'
2019-04-02 lambdaMerge branch 'feature/fake-statuses' into 'develop'
2019-04-02 lainMerge remote-tracking branch 'origin/develop' into...
2019-04-02 lambdaMerge branch 'bugfix/share-mastodon' into 'develop'
2019-04-02 lambdaMerge branch 'remove-user-activities' into 'develop'
2019-04-02 lambdaMerge branch 'get_by_id' into 'develop'
2019-04-02 Alex SMerge develop into feature/770-add-emoji-tags
2019-04-02 lambdaMerge branch 'features/pleroma-tan' into 'develop'
2019-04-01 Haelwenn (lanodan... COPYING: Wording
2019-04-01 Haelwenn (lanodan... COPYING: wrap to 79, city.jpg Unsplash, wording
2019-04-01 Haelwenn (lanodan... COPYING: Add copyright notice for the finmojis
2019-03-31 Haelwenn (lanodan... COPYING: Add copyright notice for the whole repository