Merge branch 'develop' into feature/hash-routed

This commit is contained in:
Roger Braun 2017-01-15 18:56:27 +01:00
commit 198eee82be

View File

@ -1,5 +1,5 @@
<template> <template>
<div class="user-profile panel panel-default"> <div class="user-profile panel panel-default base00-background">
<user-card-content :user="user"></user-card-content> <user-card-content :user="user"></user-card-content>
</div> </div>
</template> </template>