mirror of
https://github.com/nextcloud/server.git
synced 2026-02-20 00:12:30 -05:00
0c45778219
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> |
||
|---|---|---|
| .. | ||
| appinfo | ||
| composer | ||
| css | ||
| img | ||
| js | ||
| l10n | ||
| lib | ||
| tests | ||
| .bowerrc | ||