diff options
| author | JantsoP <jantso.porali@gmail.com> | 2017-04-04 08:41:46 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-04-04 08:41:46 +0200 |
| commit | db4a41cf58f6b15e380ff1fdbc8f392e31e4235b (patch) | |
| tree | a68429f1bade4869fccc4af5bcef8afbe570e1e1 /app/lib | |
| parent | dc89fc17cc35f8e1deaffb30ae581ac453a7a9fc (diff) | |
| parent | eb023beb4975a019d6a3b3091483c91c2c837bbd (diff) | |
Merge branch 'master' into master
Diffstat (limited to 'app/lib')
| -rw-r--r-- | app/lib/exceptions.rb | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/app/lib/exceptions.rb b/app/lib/exceptions.rb index 200da9fe1..9bc802c12 100644 --- a/app/lib/exceptions.rb +++ b/app/lib/exceptions.rb @@ -4,4 +4,5 @@ module Mastodon class Error < StandardError; end class NotPermittedError < Error; end class ValidationError < Error; end + class RaceConditionError < Error; end end |