| commit | 55b3ea9b4239f41f6e77994f99fe7750c1c2e900 | |
| author | Andre Bernet <andre@andrebernet.ch> | |
| Wed, 31 Aug 2016 21:22:19 +0000 (31 23:22 +0200) | ||
| committer | Andre Bernet <andre@andrebernet.ch> | |
| Wed, 31 Aug 2016 21:22:19 +0000 (31 23:22 +0200) | ||
| tree | 8a29c894a62d17f669e368e2180116f0c5838fd0 | treesnapshot (tar.gz zip) |
| parent | aaf7f67ebb3a511e05dcabe0f1b07164f70c6749 | commitdiff |
| parent | 75b74da2bd651414ca73bd6581ae1dd010f6dca6 | commitdiff |
(untested) Merge remote-tracking branch 'origin/schwabe/fraternl_translation_3788' into next
# Conflicts:
# radio/src/translations/nl.h.txt
# Conflicts:
# radio/src/translations/nl.h.txt
| radio/src/translations/nl.h.txt | diff1 | diff2 | blobhistory |