aboutsummaryrefslogtreecommitdiff
path: root/contrib/test-patches
diff options
context:
space:
mode:
authorWladimir J. van der Laan <laanwj@gmail.com>2013-04-11 06:57:27 +0200
committerWladimir J. van der Laan <laanwj@gmail.com>2013-04-11 06:57:27 +0200
commit9a4eaf3cff9d37118939e38e7ce029a71e062ee9 (patch)
tree6fe4e640a983149739ac9fa636030d961aaad3ae /contrib/test-patches
parentbb8bc860e3445ca22209e6cc931bc4b1c139a3a1 (diff)
parent4c237436359f5800ef29759deac570a6f897a8b3 (diff)
Merge remote-tracking branch 'jonasschnelli/new_icons' (#2497)
Conflicts: doc/assets-attribution.txt
Diffstat (limited to 'contrib/test-patches')
0 files changed, 0 insertions, 0 deletions