about summary refs log tree commit diff
path: root/app/models/subscription.rb
diff options
context:
space:
mode:
authorDavid Yip <yipdw@member.fsf.org>2018-06-03 03:01:09 -0500
committerGitHub <noreply@github.com>2018-06-03 03:01:09 -0500
commit5dd2a78034c4ab8d7eac6f4553185eadc48b6c26 (patch)
tree24f23aa2e14a8e64aa39559ba76a6a938ce42d24 /app/models/subscription.rb
parentcfdbb36bdf06de01b6701e667cc986fd701efe3c (diff)
parent8343f56b2c1d23f1c2c2c42515bae1d9a4119ff6 (diff)
Merge pull request #528 from glitch-soc/merge-upstream
Merge with tootsuite/master
Diffstat (limited to 'app/models/subscription.rb')
0 files changed, 0 insertions, 0 deletions