]> cat aescling's git repositories - mastodon.git/commit
Merge branch 'master' into glitch-soc/merge-upstream
authorThibaut Girka <thib@sitedethib.com>
Tue, 20 Aug 2019 08:33:24 +0000 (10:33 +0200)
committerThibaut Girka <thib@sitedethib.com>
Tue, 20 Aug 2019 08:33:24 +0000 (10:33 +0200)
commitdf150da4355bb224913f6de2940c9135714fb53f
tree0301dfdea48280c3942fc00da2d478f9360c148c
parent1d40325e7c9f8f380d4bb2ac55beedfb1bef5009
parent97af209c3113926534fe8c5adb7ad51fa4527cbe
Merge branch 'master' into glitch-soc/merge-upstream

Conflicts:
- config/initializers/content_security_policy.rb
  (took our version)
package.json
yarn.lock