Richard van der Hoff 69e8cb6f44 Merge branch 'rav/no_deviceload_if_disabled' into develop

2016-08-17 14:41:18 +01:00

..

structures

Merge pull request #414 from matrix-org/rav/fix_device_display_name

2016-08-12 11:44:57 +01:00

views

Merge branch 'rav/no_deviceload_if_disabled' into develop

2016-08-17 14:41:18 +01:00