projects / nextcloud-desktop.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: f5aff70 3e954bc)
Merge remote-tracking branch '2.2' into master
authorOlivier Goffart <ogoffart@woboq.com>
Fri, 4 Nov 2016 15:51:58 +0000 (16:51 +0100)
committerOlivier Goffart <ogoffart@woboq.com>
Fri, 4 Nov 2016 15:51:58 +0000 (16:51 +0100)
commit9573c5e64dca26e55648e46279031422d0a8e696
tree5905e458310c942186b8be3851951b41c4531176tree | snapshot
parentf5aff7039886a3b945c39622a19e8d54806bed8bcommit | diff
parent3e954bc17f3a73f11c8e3ea73f494fdadbbe8dc6commit | diff
Merge remote-tracking branch '2.2' into master

For the reanslation. Now transifex should be updated to update master.
This should normally be the last merge from 2.2

 Conflicts:
mirall.desktop.in
translations/client_sl.ts
translations/client_th.ts
translations/client_sl.ts diff1 | diff2 | blob | history
translations/client_th.ts diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.