Skip to content

Conversation

@GIvanovWaves
Copy link
Contributor

No description provided.

ekomarovskaya and others added 30 commits May 23, 2019 13:09
…/WavesGUI into client-1842-create

# Conflicts:
#	src/modules/welcome/templates/welcomeNewUser.html
…/WavesGUI into client-1842-create

# Conflicts:
#	src/modules/welcome/templates/welcomeNewUser.html
…/WavesGUI into client-1842-create

# Conflicts:
#	src/modules/welcome/templates/welcomeNewUser.html
…form/WavesGUI into client-998-change-create-order
…/WavesGUI into client-1842-create

# Conflicts:
#	src/modules/welcome/templates/welcomeNewUser.html
…/WavesGUI into client-1842-create

# Conflicts:
#	src/modules/welcome/less/welcomeNewUser.less
#	src/modules/welcome/templates/welcomeNewUser.html
…/WavesGUI into client-1842-create

# Conflicts:
#	src/modules/welcome/less/welcomeNewUser.less
#	src/modules/welcome/templates/welcomeNewUser.html
…/WavesGUI into client-1842-create

# Conflicts:
#	src/modules/welcome/less/welcomeNewUser.less
#	src/modules/welcome/templates/welcomeNewUser.html
Grigory Ivanov and others added 28 commits May 30, 2019 16:09
@vba2000 vba2000 merged commit 0355e23 into master May 31, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

7 participants