Jakob Borg bb438bfb17 Squashed commit of pull request #1990 ... commit 4eb3ff55ba964fde84f4ac98c7304b2b883f03e1 Merge: ddb3fea a04b005 Author: Brian R. Becker <brbecker@gmail.com> Date: Sat Jul 11 20:45:30 2015 -0700 Merge remote-tracking branch 'upstream/master' commit ddb3fea0d994794375bd3a71a417240b27cb9d09 Author: Brian R. Becker <brbecker@gmail.com> Date: Mon Jun 22 11:36:58 2015 -0700 Corrected spelling in GUI message		2015-07-20 14:22:36 +02:00
..
css	Fixed add device button being overlapped by footer (fixes #1950)	2015-07-02 16:16:42 +01:00
font	GUI Rework: reorganized folders and split app.js	2014-11-26 13:43:38 +01:00
img	Add .gitattributes; normalize line endings	2015-04-25 23:16:46 +09:00
lang	Squashed commit of pull request #1990	2015-07-20 14:22:36 +02:00