fix merge
[akkoma] / README.md
2019-01-31 Egor KislitsynMerge remote-tracking branch 'MAIN/develop' into featur...
2019-01-30 kaniiniMerge branch 'add-wiki-reference-to-readme' into 'develop'
2019-01-30 shibayashiReformat to make markdownlint happy and other little...
2019-01-30 shibayashiAdd reference to Pleroma Wiki in the Readme
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 kaniiniMerge branch 'app-list-changes' into 'develop'
2019-01-28 scarlettApp list changes: Separate into two categories, and...
2019-01-28 HaelwennMerge branch 'safe-render-activities' into 'develop'
2019-01-27 lambdaMerge branch 'safe-render-activities' into 'develop'
2019-01-27 kaniiniMerge branch 'discard-invalid-likes' into 'develop'
2019-01-27 kaniiniMerge branch 'flake-random-worker-id' into 'develop'
2019-01-27 kaniiniMerge branch 'features/mastoapi-multi-hashtag' into...
2019-01-26 kaniiniMerge branch 'webpush-endpoint-size' into 'develop'
2019-01-26 kaniiniMerge branch 'flake-from-int' into 'develop'
2019-01-26 kaniiniMerge branch 'join-in-preloads' into 'develop'
2019-01-26 kaniiniMerge branch 'documentation/mastalab' into 'develop'
2019-01-26 William PitcockREADME: Mastalab officially supports Pleroma.
2019-01-13 rinpatchResolve merge conflict
2019-01-03 rinpatchMerge branch 'captcha' into 'develop'
2018-12-30 Rin ToshakaResolve merge conflict
2018-12-29 kaniiniMerge branch 'carrot-bullying' into 'develop'
2018-12-29 kaniiniMerge branch '471_invalid_accounts_rendering' into...
2018-12-28 kaniiniMerge branch 'systemd-drop-sysadmin-privilege' into...
2018-12-28 kaniiniMerge branch 'fix/no-attachment-links' into 'develop'
2018-12-27 HaelwennMerge branch '396_elixir_1.7' into 'develop'
2018-12-27 Ivan Tashkinov[#396] Updated `ex_doc` version spec. Updated README...
2018-12-23 lambdaMerge branch 'hotfix/activity-without-content' into...
2018-12-20 lambdaMerge branch 'ci-test-fix' into 'develop'
2018-12-20 kaniiniMerge branch '114_email_confirmation' into 'develop'
2018-12-20 kaniiniMerge branch 'fix/readme-md-config-typo' into 'develop'
2018-12-20 rinpatchFix config.md path in README
2018-12-20 rinpatchFix config.md path in README
2018-12-20 kaniiniMerge branch 'readme' into 'develop'
2018-12-19 Francis DinhImprove systemd service documentation
2018-12-18 lambdaMerge branch 'feature/new-user-routes' into 'develop'
2018-12-14 hrefMerge branch 'feature/file-size-checking' into 'develop'
2018-12-10 lambdaMerge branch 'fix/config-md-typos' into 'develop'
2018-12-10 lambdaMerge branch 'support/bugfix_272' into 'develop'
2018-12-10 lambdaMerge branch 'fix/theora-detection-read-bytes' into...
2018-12-10 lambdaMerge branch 'anonymize-filter-text' into 'develop'
2018-12-09 HaelwennMerge branch 'angristan-docker' into 'develop'
2018-12-09 StanislasUpdate angristan/docker-pleroma link
2018-12-07 lambdaMerge branch '394_user_tags' into 'develop'
2018-12-06 kaniiniMerge branch 'refactor/mix-tasks' into 'develop'
2018-12-06 Rin ToshakaUpdate README.md
2018-12-06 Rin ToshakaMerge develop
2018-12-06 Egor KislitsynMerge branch 'develop' into feature/compat/push-subscri...
2018-12-05 Rin ToshakaMerge develop to refactor/mix-tasks
2018-12-01 rinpatchAttempt to resolve merge conflict
2018-11-15 Hakaba HitoyoMerge remote-tracking branch 'official/develop' into...
2018-11-14 kaniiniMerge branch 'twitter-api-direct-messages' into 'develop'
2018-11-13 lambdaMerge branch 'security/cookie-hardening' into 'develop'
2018-11-13 lambdaMerge branch 'add-MIX_ENV-to-systemd-example' into...
2018-11-13 lambdaMerge branch 'whalebird' into 'develop'
2018-11-12 AkiraFukushimaAdd Whalebird as a client application in README
2018-11-12 kaniiniMerge branch 'feature/csp-plug' into 'develop'
2018-11-11 HaelwennMerge branch 'update-readme' into 'develop'
2018-11-11 shibayashiUpdate README.md
2018-11-10 lambdaMerge branch 'bugfix/json-ld-object-sanitization' into...
2018-11-10 kaniiniMerge branch 'feature/documentation' into 'develop'
2018-11-10 Haelwenn (lanodan... README.md: Add note about config/config.md
2018-11-10 Haelwenn (lanodan... README.md: Put the systemd’s .service note to the relev...
2018-11-10 Haelwenn (lanodan... README.md: Add note for OpenRC
2018-11-10 Haelwenn (lanodan... Document the mix tasks in ex_doc instead
2018-08-23 JortyUpdate README.md for refactored Mix tasks
2018-05-24 lambdaMerge branch 'feature/lists' into 'develop'
2018-05-23 lambdaMerge branch 'feature/deps-migration' into 'develop'
2018-05-22 csaurusMerge branch 'develop' into feature/mstdn-direct-api
2018-05-21 lainMerge branch 'develop' of git.pleroma.social:pleroma...
2018-05-20 Francis DinhMerge remote-tracking branch 'upstream/develop' into...
2018-05-20 lambdaMerge branch 'develop' into 'develop'
2018-05-20 wittiCorrect 'register_user' parameters in README
2018-05-06 lambdaMerge branch 'feld-varnish' into 'develop'
2018-04-28 lambdaMerge branch 'fix/blocked-user-boosts' into 'develop'
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 'feature/message-rewrite-facility' into...
2018-04-24 lambdaMerge branch 'favicon_tag' into 'develop'
2018-04-21 lainMerge branch 'develop' of git.pleroma.social:pleroma...
2018-04-21 lambdaMerge branch '146-enable-custom-panel-by-default-and...
2018-04-21 lambdaMerge branch 'readme-update' into 'develop'
2018-04-21 lambdaUpdate README.md
2018-04-20 csaurusElaborate on setup steps and CLI commands.
2018-04-13 lambdaUpdate README.md
2018-04-10 lambdaMerge branch 'feld-varnish' into 'develop'
2018-04-08 lambdaMerge branch 'fix/persisted-mastofe-settings' into...
2018-04-07 lainMerge branch 'develop' of git.pleroma.social:pleroma...
2018-04-07 lainUpdate Readme.
2018-03-20 lambdaMerge branch 'feld-varnish' into 'develop'
2018-03-20 lambdaMerge branch 'patch-README' into 'develop'
2018-03-10 feldUpdate README.md
2018-02-24 ealMerge branch 'develop' into 'develop'
2018-02-21 lainMerge branch 'develop' into feature/activitypub
2018-02-21 lainModerator README
2018-02-21 lainAdd password reset task.
2018-02-11 Hakaba HitoyoMerge remote-tracking branch 'hakabahitoyo/feature...
2018-02-11 Roger BraunMerge branch 'develop' into feature/activitypub
2018-02-08 lambdaMerge branch 'fix/config-disable-chat' into 'develop'
2018-02-05 ealUpdate required Elixir version in README
next