[reclaim-ui] 53/459: merge w conflicts

[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 32cc4796ef89ec7e5c30ed9a693ad8d937d59c71
Merge: f7a7f3f 24e9e3d
Author: Schanzenbach, Martin <mschanzenbach@posteo.de>
AuthorDate: Thu May 2 14:51:30 2019 +0200

    merge w conflicts

 .gitlab-ci.yml                                     |    1 -
 package.json                                       |   37 +-
 src/app/app.component.ts                           |    1 +
 src/app/gns.service.ts                             |    2 +-
 src/app/identity-list/identity-list.component.scss |   12 +
 src/app/identity-list/identity-list.component.ts   |   47 +-
 src/app/open-id.service.ts                         |   15 +-
 src/assets/config.json                             |    2 +-
 src/assets/reclaim_small.png                       |  Bin 65046 -> 8663 bytes
 src/styles.scss                                    |   22 +-
 src/tsconfig.app.json                              |    3 +-
 tsconfig.json                                      |    3 +-
 yarn.lock                                          | 3113 ++++++++++----------
 13 files changed, 1663 insertions(+), 1595 deletions(-)

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