Skip to content
Snippets Groups Projects
Commit 77e49b20 authored by muellek95's avatar muellek95
Browse files

Squashed commit of the following:

commit 98173eb8
Merge: e63ffb9d b3ac6a7f
Author: Oliver Wiese <oliver.wiese@fu-berlin.de>
Date:   Tue Mar 17 12:49:10 2020 +0100

    Merge branch 'dev' of git.imp.fu-berlin.de:enzevalos/enzevalos_iphone into dev

commit e63ffb9d
Merge: b23b3f1f b23b3f1f
Author: Oliver Wiese <oliver.wiese@fu-berlin.de>
Date:   Tue Mar 17 11:27:34 2020 +0100

    empty commit

commit b3ac6a7f
Merge: b23b3f1f d8eececd
Author: wieseoli <wieseoli@mi.fu-berlin.de>
Date:   Tue Mar 17 09:42:36 2020 +0000

    Merge branch '276-fix-authenticationviewmodel-test' into 'dev'

    Resolve "Fix authenticationViewModel test"

    See merge request !51

commit d8eececd
Author: cpilaszewicz <khutbvdw>
Date:   Tue Mar 17 10:23:57 2020 +0100

    Fix unit tests

commit b23b3f1f
Author: Oliver Wiese <oliver.wiese@fu-berlin.de>
Date:   Tue Mar 17 09:59:51 2020 +0100

    add cuckoo

commit 9b71066e
Merge: a0eb5769 456075bc
Author: wieseoli <wieseoli@mi.fu-berlin.de>
Date:   Tue Mar 17 08:49:37 2020 +0000

    Merge branch 'addCuckoo' into 'dev'

    Add cuckoo library and test cases for AuthenticationScreen

    See merge request !50

commit 456075bc
Author: cezipil <cezipil@mi.fu-berlin.de>
Date:   Tue Mar 17 08:49:37 2020 +0000

    Add cuckoo library and test cases for AuthenticationScreen
parent 1aacb43c
No related branches found
No related tags found
1 merge request!46WIP: Resolve "Get IP address of URL"
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment