Merge branch 'contextmenu'
authorTom Hughes <tom@compton.nu>
Sat, 18 Feb 2017 16:20:20 +0000 (16:20 +0000)
committerTom Hughes <tom@compton.nu>
Sat, 18 Feb 2017 16:20:20 +0000 (16:20 +0000)
commit0bdf29f10bd290cfb6943e6b64a027927ebb8248
treec3d40a9d511f48ac35f72c1a1a3ea84de7ca7008
parentaf72cb51e935acff9ac0248ca87a0f43d12e999b
parent8376a430b6e8fb3de96b66a05c36cb8ac67e9c59
Merge branch 'contextmenu'
config/locales/en.yml