Henry 27adde9887 Merge branch 'develop' into 'feature/accountHighlight' ... # Conflicts: # src/components/user_card_content/user_card_content.vue		2018-08-12 12:05:08 +00:00
..
notification.js	added ability to pick the style of highlighting	2018-08-05 05:18:04 +03:00
notification.vue	Merge branch 'develop' into 'feature/accountHighlight'	2018-08-12 12:05:08 +00:00