diff options
| author | Cyrill von Wattenwyl <cvw@adfinis.com> | 2014-09-02 11:21:25 +0200 |
|---|---|---|
| committer | Cyrill von Wattenwyl <cvw@adfinis.com> | 2014-09-02 11:21:25 +0200 |
| commit | 141d615f394853ceafe13ba79ac3043ed06e6013 (patch) | |
| tree | 2e84ea758248c3c29061b82440eb75b8703eb12b /plugins/emoticons | |
| parent | 11a40dd1fef6c5b78b054617caba4325f95ee386 (diff) | |
Fixed merge conflicts
Diffstat (limited to 'plugins/emoticons')
0 files changed, 0 insertions, 0 deletions