Oswaldo Acauan 14f586faad Merge remote-tracking branch 'upstream/bbb-2x-mconf' into userlist-2x-design		2017-08-03 09:23:12 -03:00
..
api	Merge remote-tracking branch 'upstream/bbb-2x-mconf' into userlist-2x-design	2017-08-03 09:23:12 -03:00
startup	Move from annotation/ to annotations/	2017-08-02 16:52:13 -03:00
ui	Merge remote-tracking branch 'upstream/bbb-2x-mconf' into userlist-2x-design	2017-08-03 09:23:12 -03:00
utils	Add stuff from 2.x	2017-06-19 10:13:35 -03:00