Merge remote-tracking branch 'origin/develop' into conversations_three
[akkoma] / .gitignore
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 Sachin JoshiMerge branch 'develop' into bugfix/web-notification...
2019-04-29 rinpatchMerge branch 'fix/add-default-scope-mastoapi' into...
2019-04-28 kaniiniMerge branch 'fix/uploads-folder-issues' into 'develop'
2019-04-28 xsefix issues with the uploads directory
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-10 lambdaMerge branch 'feature/767-multiple-use-invite-token...
2019-04-10 SadposterMerge branch 'develop' into feature/user-status-subscri...
2019-04-10 kaniiniMerge branch 'hotfix/fix_undefined_summary' into 'develop'
2019-04-10 kaniiniMerge branch 'notification-pleroma-settings' into ...
2019-04-09 lambdaMerge branch 'bugfix/follower_count' into 'develop'
2019-04-08 lainMerge remote-tracking branch 'origin/develop' into...
2019-04-08 Egor KislitsynMerge remote-tracking branch 'pleroma/develop' into...
2019-04-08 lambdaMerge branch 'improve_upgrade_user_from_ap_id' into...
2019-04-08 lambdaMerge branch 'twitter_oauth' into 'develop'
2019-04-08 lambdaMerge branch 'feature/770-add-emoji-tags' into 'develop'
2019-04-06 Alex SMerge develop to 770-add-emoji-tags
2019-04-02 Alex SMerging develop into feature/770-add-emoji-tags
2019-04-02 Alex SMerge develop into feature/770-add-emoji-tags
2019-04-01 Alex Sadd docs folder to gitignore
2019-02-14 Wim VanderbauwhedeMerge remote-tracking branch 'upstream/develop' into...
2019-02-08 Karen KonouMerge branch 'develop' into feature/thread-muting
2019-02-08 rinpatchMerge branch 'develop' into feature/keyword-policy
2019-02-06 rinpatchMerge branch 'fix/activitypub-user-view-badmap' into...
2019-02-06 Egor KislitsynMerge branch 'develop' of git.pleroma.social:pleroma...
2019-02-05 kaniiniMerge branch 'fix-dm-index' into 'develop'
2019-02-05 kaniiniMerge branch 'feature/ap-c2s-whoami' into 'develop'
2019-02-05 kaniiniMerge branch 'feature/split-hide-network-v2' into ...
2019-02-05 kaniiniMerge branch 'bugfix/rich-media-image-nil' into 'develop'
2019-02-05 lambdaMerge branch 'bugfix/transmogrifier-bare-tags' into...
2019-02-05 lambdaMerge branch 'patch-2' into 'develop'
2019-02-05 witches.liveARGLE GARBLE
2018-12-28 kaniiniMerge branch 'systemd-drop-sysadmin-privilege' into...
2018-12-18 rinpatchMerge branch 'develop' into fix/formatter-ignore-html...
2018-12-18 lambdaMerge branch 'feature/new-user-routes' into 'develop'
2018-12-18 raenoMerge branch 'develop' into oembed_provider
2018-12-18 lambdaMerge branch 'runtime-static-plug' into 'develop'
2018-12-17 hrefInstance/Static runtime plug
2018-12-06 Egor KislitsynMerge branch 'develop' into feature/compat/push-subscri...
2018-12-01 rinpatchAttempt to resolve merge conflict
2018-12-01 lainMerge branch 'develop' of git.pleroma.social:pleroma...
2018-11-30 kaniiniMerge branch 'feature/reverse-proxy' into 'develop'
2018-11-30 hrefreverse proxy / uploads
2018-08-16 kaniiniMerge branch 'fix/put-repeats-at-activitypub-outbox...
2018-06-14 lambdaMerge branch 'feature/twitterapi-unrepeat' into 'develop'
2018-06-12 lambdaMerge branch 'develop' into 'develop'
2018-06-12 lambdaMerge branch 'feature/list-streaming' into 'develop'
2018-06-11 ealMerge branch 'fix/mix-task-caching' into 'develop'
2018-06-11 lambdaMerge branch 'feature/domain-blocks' into 'develop'
2018-06-08 lambdaMerge branch 'bugfix/locked-account-regression' into...
2018-06-07 lambdaMerge branch 'develop' into 'mastopost'
2018-06-07 lambdaMerge branch 'feature/quarantine' into 'develop'
2018-06-07 lambdaMerge branch 'import' into 'develop'
2018-06-07 Rachel HFix follow errors
2018-06-06 Rachel HAllow posting images without text in mastofe
2018-05-06 lambdaMerge branch 'feld-varnish' into 'develop'
2018-04-28 lambdaMerge branch 'fix/blocked-user-boosts' into 'develop'
2018-04-28 Wim VanderbauwhedeMerge remote-tracking branch 'upstream/develop' into...
2018-04-25 Francis DinhMerge branch 'feature/unrepeats' of git.pleroma.social...
2018-04-25 Francis DinhMerge branch 'develop' of https://git.pleroma.social...
2018-04-24 lambdaMerge branch 'gitignore' into 'develop'
2018-04-24 Rachel HAdd common files to gitignore
2018-04-24 lambdaMerge branch 'feature/message-rewrite-facility' into...
2018-04-24 lambdaMerge branch 'favicon_tag' into 'develop'
2018-04-20 Francis DinhMerge branch 'develop' of https://git.pleroma.social...
2018-04-19 lainMerge branch 'develop' of git.pleroma.social:pleroma...
2018-04-19 lambdaMerge branch 'feature/qvitter-notification-endpoint...
2018-04-19 lambdaMerge branch 'patch-2' into 'develop'
2018-04-19 Dominik V. SalonenIgnore setup_db.psql and ignore a folder for custom...
2017-03-30 Roger BraunIgnore uploads.
2017-03-17 Roger BraunPhoenix skeleton