about summary refs log tree commit diff
path: root/lib
diff options
context:
space:
mode:
authorClaire <claire.github-309c@sitedethib.com>2022-05-04 19:15:50 +0200
committerClaire <claire.github-309c@sitedethib.com>2022-05-04 19:15:50 +0200
commitc85c3fb708078e1576edbd4d71495ccabc35504d (patch)
tree8c7ede7d8a7d847e247fb45c73a888492ac029d4 /lib
parent58ac5ae643dc57ffd20017c54e7be523deaef156 (diff)
parent8c644dcbd9bada5b5ad00a2c3d94fb46a4e77cb4 (diff)
Merge branch 'main' into glitch-soc/merge-upstream
Conflicts:
- `package.json`:
  Upstream updated `jest`, moving its config in a separate file.
  This config was modified in glitch-soc, so the corresponding changes have
  been ported to `jest.config.js`
Diffstat (limited to 'lib')
-rw-r--r--lib/mastodon/version.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/mastodon/version.rb b/lib/mastodon/version.rb
index d6270df03..bc22539d9 100644
--- a/lib/mastodon/version.rb
+++ b/lib/mastodon/version.rb
@@ -13,7 +13,7 @@ module Mastodon
     end
 
     def patch
-      1
+      2
     end
 
     def flags