[reclaim-ui] 324/459: Merge branch 'master' into 'i18n'

[gnunet]

This is an automated email from the git hooks/post-receive script.

martin-schanzenbach pushed a commit to branch master
in repository reclaim-ui.

commit e5e80cd23329987ccd4afa6c68e77cfec47d987d
Merge: 10d019d 20a59c9
Author: annawimbauer <anna.wimbauer@gmx.de>
AuthorDate: Wed Oct 7 07:55:34 2020 +0000

    Merge branch 'master' into 'i18n'
    
    # Conflicts:
    #   src/app/edit-credentials/edit-credentials.component.html
    #   src/app/edit-identity/edit-identity.component.html

 src/app/credential.service.ts                          |  3 ---
 src/app/edit-credentials/edit-credentials.component.ts | 14 ++++----------
 src/app/edit-identity/edit-identity.component.ts       |  2 +-
 src/app/idProvider.ts                                  |  1 -
 4 files changed, 5 insertions(+), 15 deletions(-)

-- 
To stop receiving notification emails like this one, please contact
gnunet@gnunet.org.