Čarodej 8a64fe070b Merge remote-tracking branch 'origin/social_authentication' into subscription ...

# Conflicts:
#	.env.example
#	composer.lock
#	public/mix-manifest.json
#	resources/js/views/User/Password.vue
#	routes/api.php
#	src/App/Users/Actions/CreateNewUserAction.php
#	tests/App/Users/UserAccountTest.php

2022-01-10 07:38:56 +01:00

..

app.js

Payment setting frontend part 2 - payment setup front/backend

2022-01-07 12:42:47 +01:00

fileBrowser.js

File item refactoring

2021-10-27 16:48:43 +02:00

fileFunctions.js

- Restriction UI warning

2022-01-05 12:48:07 +01:00

lists.js

Payment setting frontend part 1

2022-01-07 09:53:59 +01:00

payments.js

Payment setting frontend part 2 - payment setup front/backend

2022-01-07 12:42:47 +01:00

sharing.js

TypedAvatar.vue colored background

2021-08-31 09:52:22 +02:00

teams.js

- ability leave team folder

2021-10-26 09:05:08 +02:00

userAuth.js

Merge remote-tracking branch 'origin/social_authentication' into subscription

2022-01-10 07:38:56 +01:00