ESCA111/neochat
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
1,408 Commits 169 Branches 68 Tags
e7bada4cdee3fab05c4dec5fea8d6c8d0ef14f34
Commit Graph

24 Commits

Author SHA1 Message Date
l10n daemon script
e7bada4cde SVN_SILENT made messages (.desktop file) - always resolve ours 
In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"
 2021-02-07 06:47:50 +01:00
l10n daemon script
d9cf7ce552 SVN_SILENT made messages (.desktop file) - always resolve ours 
In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"
 2021-01-27 08:48:35 +01:00
l10n daemon script
80b6d80c7d SVN_SILENT made messages (.desktop file) - always resolve ours 
In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"
 2021-01-23 06:40:44 +01:00
l10n daemon script
cec47b40cc SVN_SILENT made messages (.desktop file) - always resolve ours 
In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"
 2021-01-21 06:57:29 +01:00
l10n daemon script
038441b854 SVN_SILENT made messages (.desktop file) - always resolve ours 
In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"
 2021-01-16 06:41:58 +01:00
l10n daemon script
b7da732a15 SVN_SILENT made messages (.desktop file) - always resolve ours 
In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"
 2021-01-15 06:38:23 +01:00
l10n daemon script
085ebaa451 SVN_SILENT made messages (.desktop file) - always resolve ours 
In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"
 2021-01-14 07:00:09 +01:00
Christopher Hock
e5771e2733 Change Comment in line 25 of neochat.notifyrc 2021-01-14 00:49:39 +01:00
l10n daemon script
59df28822c SVN_SILENT made messages (.desktop file) - always resolve ours 
In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"
 2021-01-12 06:44:34 +01:00
l10n daemon script
cbc082c1b6 SVN_SILENT made messages (.desktop file) - always resolve ours 
In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"
 2021-01-01 06:26:01 +01:00
l10n daemon script
4e765f51a7 SVN_SILENT made messages (.desktop file) - always resolve ours 
In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"
 2020-12-29 06:16:30 +01:00
l10n daemon script
a5cf0af004 SVN_SILENT made messages (.desktop file) - always resolve ours 
In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"
 2020-12-26 06:13:48 +01:00
Nicolas Fella
ef8c21213a Fix icon in notifyrc 2020-12-22 20:53:49 +01:00
l10n daemon script
2056d75ee7 SVN_SILENT made messages (.desktop file) - always resolve ours 
In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"
 2020-12-16 06:41:07 +01:00
l10n daemon script
54b07737c0 SVN_SILENT made messages (.desktop file) - always resolve ours 
In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"
 2020-12-14 06:06:35 +01:00
l10n daemon script
d9218b203d SVN_SILENT made messages (.desktop file) - always resolve ours 
In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"
 2020-11-17 06:15:36 +01:00
l10n daemon script
4240d55669 SVN_SILENT made messages (.desktop file) - always resolve ours 
In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"
 2020-11-13 06:21:10 +01:00
l10n daemon script
04020e7021 SVN_SILENT made messages (.desktop file) - always resolve ours 
In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"
 2020-11-12 06:24:28 +01:00
l10n daemon script
91f82fb42c SVN_SILENT made messages (.desktop file) - always resolve ours 
In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"
 2020-11-07 06:24:31 +01:00
l10n daemon script
ed3919cb83 SVN_SILENT made messages (.desktop file) - always resolve ours 
In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"
 2020-11-06 06:20:30 +01:00
l10n daemon script
bd0a01b235 SVN_SILENT made messages (.desktop file) - always resolve ours 
In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"
 2020-11-05 06:31:55 +01:00
l10n daemon script
36a92be7bd SVN_SILENT made messages (.desktop file) - always resolve ours 
In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"
 2020-11-04 06:30:04 +01:00
l10n daemon script
e4338a599e SVN_SILENT made messages (.desktop file) - always resolve ours 
In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"
 2020-11-03 06:12:27 +01:00
Tobias Fella
8e7c84fd78 Port the notification backend to KNotifications 2020-11-02 22:46:51 +00:00