Daniel Calviño Sánchez 0c45778219 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>		2017-11-28 02:35:39 +01:00
..
autocomplete.scss	Add variable for border-radius	2017-11-03 14:08:21 +01:00
comments.css	Fix silent conflicts due to merging #7256 after #7251	2017-11-28 02:35:39 +01:00