diff options
author | Rémy Coutable <remy@rymai.me> | 2016-07-11 11:53:43 +0300 |
---|---|---|
committer | Rémy Coutable <remy@rymai.me> | 2016-07-11 11:53:43 +0300 |
commit | e1fe1e7662b4220f2277832c693b2c7a8c30edee (patch) | |
tree | 1c2f0fd45133c101f1953b90dcf5bd12e25f5f44 /spec/factories/notification_settings.rb | |
parent | 05807f364b776d034a54c45a3d007115c9ec3b50 (diff) | |
parent | 7303de91ecd6c3a39b5dfa27cd3ac3db613b1e42 (diff) |
Merge remote-tracking branch 'origin/master' into 8-10-stable
Diffstat (limited to 'spec/factories/notification_settings.rb')
0 files changed, 0 insertions, 0 deletions