Tyler Gibson 203fc37c7c Merge branch 'master' into malyan_m200
# Conflicts:
#	resources/qml/SidebarSimple.qml

Resolving with updated 2 digit truncation
2018-01-07 22:54:56 -08:00
..
2017-07-26 10:58:54 +02:00