summaryrefslogtreecommitdiffstats
path: root/config/chroot_local-includes/lib
diff options
context:
space:
mode:
authorintrigeri <intrigeri@boum.org>2019-10-05 14:51:34 +0000
committerintrigeri <intrigeri@boum.org>2019-10-05 14:51:34 +0000
commit7f06da770fc2c555fabf602943b583ae11ed08bf (patch)
treec7bb5b55c1a786545a38e44cdf4fe12fbcb39dfd /config/chroot_local-includes/lib
parentc296ed8cb0539d1fe7089709cab219ac9d1fea30 (diff)
parent9a8ca93d4bd1e2bd42a15a841c37c4ace55df222 (diff)
Merge remote-tracking branch 'origin/devel' into feature/17098-refactor-greeter
This includes resolving conflicts in PO and POT files, this way: 1. git checkout origin/devel po/*.po po/*.pot 2. ./refresh-translations 3. git add po
Diffstat (limited to 'config/chroot_local-includes/lib')
0 files changed, 0 insertions, 0 deletions