Robin Linus e66598d77f Squashed commit of the following: ... commit dd00d53895b824fbe4170c4a34b104303f722ccd Merge: 2b3698e cb9ea12 Author: Robin Linus <robin_woll@capira.de> Date: Wed Feb 10 00:27:32 2016 -0600 Merge branch 'name-device' into merge123 # Conflicts: # app/elements/buddy-finder/buddy-avatar.html # app/elements/buddy-finder/buddy-finder.html # app/elements/buddy-finder/personal-avatar.html # app/index.html commit cb9ea1235001f0cc23514cb622ce711cdc0538af Author: Robin Linus <robin_woll@capira.de> Date: Tue Feb 9 23:43:49 2016 -0600 #13 Feature Request: Name your device commit 6fa43b56f4e705a19e68b62bc671a4948b6968fb Author: Robin Linus <robin_woll@capira.de> Date: Fri Jan 1 19:54:56 2016 +0100 Initial commit fc55c86f5cf95039355d85be7409e68f27246696 Author: Robin Linus <robin_woll@capira.de> Date: Fri Jan 1 18:06:27 2016 +0100 Fix fullscreen layout on iOS		2016-02-10 08:58:09 -06:00
..
buddy-avatar.html	Squashed commit of the following:	2016-02-10 08:58:09 -06:00
buddy-finder.html	Squashed commit of the following:	2016-02-10 08:58:09 -06:00
device-name-dialog.html	Squashed commit of the following:	2016-02-10 08:58:09 -06:00
device-name.html	Squashed commit of the following:	2016-02-10 08:58:09 -06:00
personal-avatar.html	Squashed commit of the following:	2016-02-10 08:58:09 -06:00