tarrien/Mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' into glitch-soc/merge-upstream

Browse Source 
Conflicts:
- `Gemfile`:
  We updated httplog in a separate commit.
  Took upstream's change which updated it further.
- `Gemfile.lock`:
  We updated httplog in a separate commit.
  Took upstream's change which updated it further.
- `app/lib/sanitize_config.rb`:
  Upstream added better unsupported link stripping,
  while we had different sanitizing configs.
  Took only upstream's link stripping code.
- `config/locales/simple_form.pl.yml`:
  Strings unused in glitch-soc had been removed from
  glitch-soc, reintroduced them even if they are not
  useful, to reduce the risk of later merge conflicts.
This commit is contained in:
Thibaut Girka
2020-02-09 12:15:55 +01:00
parent a2cfe3daaa 57c42c20c0
commit dae5e446fe
37 changed files with 455 additions and 220 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/mastodon/version.rb
View File

@@ -17,7 +17,7 @@ module Mastodon
end
def flags
'rc2'
''
end
def suffix