Merge remote-tracking branch 'upstream/develop' into account-menu-splitted

Browse Source

# Conflicts:
#	app/assets/javascripts/directives/views/accountMenu.ts

...

This commit is contained in:

VardanHakobyan

2021-06-17 13:37:16 +04:00

parent a76213dd1f 184ce19ad7

commit 374e9c0616

12 changed files with 33 additions and 45 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

0

app/assets/javascripts/directives/views/accountMenu.ts Normal file