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

This commit is contained in:
Thibaut Girka
2019-06-28 21:36:50 +02:00
15 changed files with 92 additions and 20 deletions

View File

@@ -0,0 +1,5 @@
require 'rails_helper'
RSpec.describe CustomEmojiCategory, type: :model do
pending "add some examples to (or delete) #{__FILE__}"
end