about summary refs log tree commit diff
path: root/lib
diff options
context:
space:
mode:
authorClaire <claire.github-309c@sitedethib.com>2022-04-08 23:07:00 +0200
committerGitHub <noreply@github.com>2022-04-08 23:07:00 +0200
commit9309c53d21df806d57dd59dbc59a807d2f8b8b11 (patch)
tree76da7fad9be426213cafdc7f43cba5f00a047caa /lib
parentc483101b4ae7d9f22ea43921c512f479e16e98ca (diff)
parenteff62528debf33591c921b28ae2609c948161860 (diff)
Merge pull request #1738 from ClearlyClaire/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'lib')
-rw-r--r--lib/exceptions.rb1
-rw-r--r--lib/mastodon/version.rb2
2 files changed, 2 insertions, 1 deletions
diff --git a/lib/exceptions.rb b/lib/exceptions.rb
index eb472abaa..0c677b660 100644
--- a/lib/exceptions.rb
+++ b/lib/exceptions.rb
@@ -10,6 +10,7 @@ module Mastodon
   class StreamValidationError < ValidationError; end
   class RaceConditionError < Error; end
   class RateLimitExceededError < Error; end
+  class SyntaxError < Error; end
 
   class UnexpectedResponseError < Error
     attr_reader :response
diff --git a/lib/mastodon/version.rb b/lib/mastodon/version.rb
index cb29e4a54..d6270df03 100644
--- a/lib/mastodon/version.rb
+++ b/lib/mastodon/version.rb
@@ -13,7 +13,7 @@ module Mastodon
     end
 
     def patch
-      0
+      1
     end
 
     def flags