Commit 5ae40170 authored by Oliver Wiese's avatar Oliver Wiese
Browse files

Merge remote-tracking branch 'refs/remotes/origin/Thesis_hannes_merge_ready_versuch1'

Conflicts:
	enzevalos_iphone/StudySettings.swift
parents d7e7bd1d f932361c
......@@ -53,6 +53,7 @@ class StudySettings {
static var securityIndicator: SecurityIndicator = SecurityIndicator.load() as! SecurityIndicator
static var invitationsmode: Inviation = Inviation.load() as! Inviation
/// whether to show a normal inbox (false) or a (currently slightly buggy) categorized interface (true)
static var showCategorizedInterface = false
static var useAvatars = true
......
Supports Markdown
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