about summary refs log tree commit diff
path: root/public
diff options
context:
space:
mode:
authorDavid Yip <yipdw@member.fsf.org>2018-06-02 16:15:36 -0500
committerDavid Yip <yipdw@member.fsf.org>2018-06-02 16:15:36 -0500
commit3550470c18425e80a322e6fe56245c9ede3d0689 (patch)
tree10c7539e0bf80a9a5d20aa2c8acf227803d3789b /public
parenta641d1b5b8e9f20104ab16e5419e6dee4e5af37f (diff)
parent00512ecf87e1098f5632eeec2cd116344a787523 (diff)
Merge remote-tracking branch 'origin/master' into gs-master
  Conflicts:
 	app/javascript/mastodon/locales/en.json
 	app/javascript/mastodon/locales/ja.json
 	app/javascript/mastodon/locales/pl.json

The above conflicts appear to be a text conflict introduced by
glitch-soc's additional level of columns (i.e. moving a bunch of columns
under the Misc option).  They were resolved via accept-ours.
Diffstat (limited to 'public')
0 files changed, 0 insertions, 0 deletions