about summary refs log tree commit diff
path: root/app/javascript/flavours/glitch/locales/io.js
diff options
context:
space:
mode:
authorDavid Yip <yipdw@member.fsf.org>2018-01-21 13:36:10 -0600
committerDavid Yip <yipdw@member.fsf.org>2018-01-21 13:36:10 -0600
commit1253279febc05c96e4ec875588a0c1c6d723b23c (patch)
treebd4adcddd508239656ff8d37f636af800aa0f742 /app/javascript/flavours/glitch/locales/io.js
parent2c578a01d86ef65d1b0117f6fff32a6b57463dde (diff)
parentcfd2b06821a12f6b4aae427dbb9e6707d1cff9dc (diff)
Merge remote-tracking branch 'origin/master' into merge-upstream
 Conflicts:
	app/controllers/settings/two_factor_authentication/confirmations_controller.rb
Diffstat (limited to 'app/javascript/flavours/glitch/locales/io.js')
0 files changed, 0 insertions, 0 deletions