summaryrefslogtreecommitdiffstats
path: root/wiki/src/upgrade/win-download.it.po
diff options
context:
space:
mode:
authorCyril Brulebois <ckb@riseup.net>2020-03-27 19:11:42 +0100
committerCyril Brulebois <ckb@riseup.net>2020-03-27 19:23:19 +0100
commit2c3afc8cce4f93383236606d02bcf04536e5a7ca (patch)
treefb8ac47d18f98239e85d7e34d2a4879a37c3967f /wiki/src/upgrade/win-download.it.po
parent01b50939b806b76cf702da6a0fceb70e9ad7f60e (diff)
parent7a4b549d19f8038937d17fcbcd848d34d792ffb0 (diff)
Merge branch 'testing' into develdevel
Conflicts: debian/changelog Keep a single changelog entry, for the second next major release (4.11). During the merge after the upcoming major release (4.5), the extra entry should find its way between the 4.5~rc1 entry and the dummy 4.11 one.
Diffstat (limited to 'wiki/src/upgrade/win-download.it.po')
0 files changed, 0 insertions, 0 deletions