Skip to content

Conversation

@Jahsus
Copy link
Contributor

@Jahsus Jahsus commented Jun 7, 2019

No description provided.

okanishcheva and others added 30 commits June 3, 2019 16:11
…/WavesGUI into dexw-1751-remove-clickable-logo

# Conflicts:
#	src/modules/ui/directives/siteHeader/SiteHeader.js
#	src/modules/ui/directives/siteHeader/siteHeader.html
…/WavesGUI into dexw-1751-remove-clickable-logo

# Conflicts:
#	src/modules/ui/directives/siteHeader/SiteHeader.js
#	src/modules/ui/directives/siteHeader/siteHeader.html
…/WavesGUI into dexw-1751-remove-clickable-logo

# Conflicts:
#	src/modules/ui/directives/siteHeader/SiteHeader.js
#	src/modules/ui/directives/siteHeader/siteHeader.html
…atform/WavesGUI into dexw-1751-remove-clickable-logo

# Conflicts:
#	src/modules/ui/directives/siteHeader/siteHeader.less
…atform/WavesGUI into dexw-1751-remove-clickable-logo

# Conflicts:
#	src/modules/ui/directives/siteHeader/siteHeader.less
…atform/WavesGUI into dexw-1751-remove-clickable-logo

# Conflicts:
#	src/modules/ui/directives/siteHeader/siteHeader.less
…atform/WavesGUI into dexw-1751-remove-clickable-logo

# Conflicts:
#	src/modules/ui/directives/siteHeader/siteHeader.less
…atform/WavesGUI into dexw-1751-remove-clickable-logo

# Conflicts:
#	src/modules/ui/directives/siteHeader/siteHeader.less
…atform/WavesGUI into dexw-1751-remove-clickable-logo

# Conflicts:
#	src/modules/ui/directives/siteHeader/siteHeader.less
…atform/WavesGUI into dexw-1751-remove-clickable-logo

# Conflicts:
#	src/modules/ui/directives/siteHeader/siteHeader.less
…rm/WavesGUI into dexw-1751-remove-clickable-logo

# Conflicts:
#	src/modules/ui/directives/siteHeader/siteHeader.html
Jahsus and others added 28 commits June 6, 2019 14:24
…tform/WavesGUI into dexw-1751-remove-clickable-logo
…tform/WavesGUI into dexw-1751-remove-clickable-logo
…tform/WavesGUI into dexw-1751-remove-clickable-logo
…rm/WavesGUI into dexw-1751-remove-clickable-logo

# Conflicts:
#	src/modules/app/less/app.less
…rm/WavesGUI into dexw-1751-remove-clickable-logo

# Conflicts:
#	src/modules/app/less/app.less
…tform/WavesGUI into dexw-1751-remove-clickable-logo
…rm/WavesGUI into dexw-1751-remove-clickable-logo

# Conflicts:
#	src/modules/app/less/app.less
…tform/WavesGUI into dexw-1751-remove-clickable-logo
…rm/WavesGUI into dexw-1751-remove-clickable-logo

# Conflicts:
#	src/modules/app/less/app.less
…rm/WavesGUI into dexw-1751-remove-clickable-logo

# Conflicts:
#	src/modules/app/less/app.less
…tform/WavesGUI into dexw-1751-remove-clickable-logo
…rm/WavesGUI into dexw-1751-remove-clickable-logo

# Conflicts:
#	src/modules/app/less/app.less
…tform/WavesGUI into dexw-1751-remove-clickable-logo
@tsigel tsigel merged commit 09731d8 into master Jun 7, 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.

6 participants