Skip to content

Merge digitrust - #1

Merged
LassaLek merged 231 commits into
masterfrom
merge-digitrust
Sep 5, 2019
Merged

Merge digitrust#1
LassaLek merged 231 commits into
masterfrom
merge-digitrust

Conversation

@LassaLek

@LassaLek LassaLek commented Sep 5, 2019

Copy link
Copy Markdown
Owner

No description provided.

Petr Hoza added 29 commits August 1, 2019 09:42
use all indexes
…29/frontend/cmp into CPEX/PROJ-93

# Conflicts:
#	src/index.html
� Conflicts:
�	.eslintrc
�	package.json
�	src/components/app.jsx
�	src/components/app.less
�	src/components/app.test.js
�	src/components/button/button.jsx
�	src/components/button/button.less
�	src/components/closebutton/closebutton.jsx
�	src/components/footer/footer.jsx
�	src/components/footer/footer.less
�	src/components/label/label.jsx
�	src/components/panel/panel.jsx
�	src/components/popup/details/details.jsx
�	src/components/popup/details/details.less
�	src/components/popup/details/details.test.js
�	src/components/popup/details/purposes/purposes.jsx
�	src/components/popup/details/purposes/purposes.less
�	src/components/popup/details/purposes/purposes.test.js
�	src/components/popup/details/vendors/vendors.jsx
�	src/components/popup/details/vendors/vendors.less
�	src/components/popup/details/vendors/vendors.test.js
�	src/components/popup/intro/footer.jsx
�	src/components/popup/intro/footer.less
�	src/components/popup/intro/intro.jsx
�	src/components/popup/intro/intro.less
�	src/components/popup/popup.jsx
�	src/components/popup/popup.less
�	src/components/popup/popup.test.js
�	src/components/switch/switch.jsx
�	src/components/switch/switch.test.js
�	src/docs/lib/stub.js
�	src/index.html
�	src/lib/cmp.js
�	src/lib/config.js
�	src/lib/cookie/cookie.js
�	src/lib/cookie/cookie.test.js
�	src/lib/cookie/cookieutils.js
�	src/lib/init.js
�	src/lib/portal.js
�	src/lib/store.js
�	src/lib/translations.js
�	src/lib/utils.js
�	src/lib/vendor.js
�	yarn.lock
@LassaLek
LassaLek merged commit 6c53f28 into master Sep 5, 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.

3 participants