diff options
| author | Daniel Calviño Sánchez <danxuliu@gmail.com> | 2017-11-28 02:04:28 +0100 |
|---|---|---|
| committer | Daniel Calviño Sánchez <danxuliu@gmail.com> | 2017-11-28 02:35:39 +0100 |
| commit | 0c457782199ea04eb9977c3baaebc843b0099e9a (patch) | |
| tree | ec875e737f030017109f5b0b0e3a74298ee3a386 /apps/oauth2/l10n/es_EC.js | |
| parent | 7d9e47543482acd430a18b482cd61bdd5eecc3e9 (diff) | |
| download | nextcloud-server-0c457782199ea04eb9977c3baaebc843b0099e9a.tar.gz nextcloud-server-0c457782199ea04eb9977c3baaebc843b0099e9a.zip | |
Fix silent conflicts due to merging #7256 after #7251
Although #7256 was merged cleanly some of the changes really conflicted
with those introduced by the last commit of #7251, and this broke the
appearance of the author row of comments. This commit fixes those silent
conflicts and restores the appearance of the author row.
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
Diffstat (limited to 'apps/oauth2/l10n/es_EC.js')
0 files changed, 0 insertions, 0 deletions