woutervanwijk 43d80e9a77 Merge branch 'master' into develop ... Conflicts: webclient/js/functionsvars.js		2013-11-12 20:54:53 +01:00
..
fontawesome-webfont.eot	Merge branch 'master' into develop	2013-11-12 20:54:53 +01:00
fontawesome-webfont.svg	Merge branch 'master' into develop	2013-11-12 20:54:53 +01:00
fontawesome-webfont.ttf	Merge branch 'master' into develop	2013-11-12 20:54:53 +01:00
fontawesome-webfont.woff	Merge branch 'master' into develop	2013-11-12 20:54:53 +01:00
FontAwesome.otf	Merge branch 'master' into develop	2013-11-12 20:54:53 +01:00