diff options
Merge branch 'maint'
Conflicts:
src/io.c
src/notify.c
src/utils.c
Diffstat (limited to 'po/POTFILES.in%2525252525253fid%2525252525253d1019be7cced2c0dfb677336ee2fe1da8bfde5a22%25252525253fid%25252525253d6898a9dcf1f3614f5c132d4649f3d414feb6df5e%252525253fid%252525253df5efea85a6874e4dcb206f91cedf29ef3d56f06b%2525253fid%2525253df5efea85a6874e4dcb206f91cedf29ef3d56f06b&id2%2525253db4cefe2db9d45dfba9bfd633288a406a8ad2a4c3%25253fid%25253df5efea85a6874e4dcb206f91cedf29ef3d56f06b&id2%25253db4cefe2db9d45dfba9bfd633288a406a8ad2a4c3%253fid%253df5efea85a6874e4dcb206f91cedf29ef3d56f06b%3fid%3df5efea85a6874e4dcb206f91cedf29ef3d56f06b?id=f5efea85a6874e4dcb206f91cedf29ef3d56f06b')
0 files changed, 0 insertions, 0 deletions