|
|
1661561640
|
Merge branch 'reactions' into develop
# Conflicts:
# Gemfile.lock
# app/javascript/flavours/glitch/locales/de.js
# app/javascript/flavours/glitch/locales/en.js
# app/javascript/flavours/glitch/locales/es.js
# app/javascript/flavours/glitch/locales/fr.js
# app/javascript/flavours/glitch/locales/ja.js
# app/javascript/flavours/glitch/locales/ko.js
# app/javascript/flavours/glitch/locales/pl.js
# app/javascript/flavours/glitch/locales/zh-CN.js
# app/javascript/mastodon/actions/interactions.js
# app/javascript/mastodon/locales/fr.json
# db/migrate/20221124114030_create_status_reactions.rb
|
2022-12-22 00:18:36 +01:00 |
|
Claire
|
b248aa4d3e
|
Merge branch 'main' into glitch-soc/merge-upstream
|
2022-12-21 15:59:39 +01:00 |
|
Kai
|
2bad619d17
|
Change HTTP to HTTPS for links in CODE_OF_CONDUCT (#22465)
|
2022-12-19 09:46:22 +09:00 |
|
|
|
c89c2df34d
|
Add info about this fork
|
2022-04-27 23:48:11 +02:00 |
|
ThibG
|
a03fb7b703
|
Change e-mail contact for CoC enforcement
|
2019-06-06 17:42:07 +02:00 |
|
beatrix
|
b7a7eb84dd
|
update code of conduct email address
|
2017-11-21 11:01:28 -05:00 |
|
Eugen Rochko
|
92aaa55f06
|
Add code of conduct from GitHub generator (#5674)
|
2017-11-13 17:28:55 +01:00 |
|
