wbrawner/server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
server/apps
History
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
..
admin_audit Update license headers 2017-11-06 16:56:19 +01:00
comments Fix silent conflicts due to merging #7256 after #7251 2017-11-28 02:35:39 +01:00
dav Merge pull request #6901 from nextcloud/bugfix/4014/catch_parsing_error 2017-11-27 17:50:37 +01:00
encryption [tx-robot] updated from transifex 2017-11-12 01:10:00 +00:00
federatedfilesharing [tx-robot] updated from transifex 2017-11-23 01:09:47 +00:00
federation [tx-robot] updated from transifex 2017-11-25 01:09:56 +00:00
files Merge pull request #7222 from nextcloud/fix-filerow-avatars 2017-11-27 16:46:11 +01:00
files_external [tx-robot] updated from transifex 2017-11-25 01:09:56 +00:00
files_sharing Merge pull request #7222 from nextcloud/fix-filerow-avatars 2017-11-27 16:46:11 +01:00
files_trashbin Merge pull request #7051 from nextcloud/breadcrumbs-refactor 2017-11-13 12:19:05 +01:00
files_versions [tx-robot] updated from transifex 2017-11-23 01:09:47 +00:00
lookup_server_connector LookupServerConnector Autoloader 2017-10-24 20:40:12 +02:00
oauth2 [tx-robot] updated from transifex 2017-11-23 01:09:47 +00:00
provisioning_api Change @georgehrke's email 2017-11-06 20:38:59 +01:00
sharebymail [tx-robot] updated from transifex 2017-11-20 01:09:40 +00:00
systemtags [tx-robot] updated from transifex 2017-11-12 01:10:00 +00:00
testing Update license headers 2017-11-06 16:56:19 +01:00
theming [tx-robot] updated from transifex 2017-11-20 01:09:40 +00:00
twofactor_backupcodes [tx-robot] updated from transifex 2017-11-12 01:10:00 +00:00
updatenotification Make isUpdateAvailable non-static 2017-11-25 12:01:02 +01:00
user_ldap Rename "LDAP" to "LDAP/AD-integration" 2017-11-27 09:49:28 +01:00
workflowengine [tx-robot] updated from transifex 2017-11-23 01:09:47 +00:00