Shpuld Shpludson ea0a12f604 Merge branch 'develop' into 'iss-149/profile-fields-setting' ... # Conflicts: # src/components/settings_modal/tabs/profile_tab.vue		2020-06-27 07:19:49 +00:00
..
specs	Merge branch 'develop' into 'iss-149/profile-fields-setting'	2020-06-27 07:19:49 +00:00
.eslintrc	Basic skeleton	2016-10-26 16:46:32 +02:00
index.js	firefox	2019-04-24 21:53:51 +03:00
karma.conf.js	add html-webpack-plugin to karma config	2019-12-03 14:40:51 -05:00