about summary refs log tree commit diff
path: root/Vagrantfile
diff options
context:
space:
mode:
authorDavid Yip <yipdw@member.fsf.org>2018-05-21 16:30:24 -0500
committerDavid Yip <yipdw@member.fsf.org>2018-05-21 16:30:24 -0500
commit6dd676e00690e2bfd117e480461ca5a83c1a3a95 (patch)
treef94c0f5311d9b995d78420c17f314a820c2ec6d8 /Vagrantfile
parentf93806ea55956f911e24e52d8aa339573e37dd00 (diff)
parent810f92e697f0533a70f7d65b5079b34b5d74702f (diff)
Merge remote-tracking branch 'origin/master' into merge-upstream
  Conflicts:
 	config/locales/pl.yml

The conflict in config/locales/pl.yml concerns the themes key, which is
not used in glitchsoc.  Resolution: remove the themes key-related
changes, i.e. accept-ours.
Diffstat (limited to 'Vagrantfile')
0 files changed, 0 insertions, 0 deletions