As part of NTNU's increased focus on security, all users are now forced to enable and use Two-factor authentication.

Commit 9ae1f005 authored by Arne Styve's avatar Arne Styve
Browse files

Merge tag 'v0.5.1' into develop

no message

# Conflicts:
#	src/no/ntnu/idata2001/contacts/views/ContactsApp.java
parents c97acc55 4a2a2425
......@@ -37,7 +37,6 @@ import no.ntnu.idata2001.contacts.model.ContactDetails;
* The main window/application of the contacts app.
*/
public class ContactsApp extends Application {
private MainController mainController;
// The JavaFX ObservableListWrapper used to connect tot he underlying AddressBook
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment