Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6565e08c authored by Arnau Vàzquez's avatar Arnau Vàzquez
Browse files

Merge branch 'dev/3.5.2' into 'murena-main' 

Update to 3.5.2

See merge request !35
parents 0ca7e4a3 2354c43e

.editorconfig

+1 −1
Original line number Diff line number Diff line
@@ -6,7 +6,7 @@ charset = utf-8 
end_of_line = lf

insert_final_newline = true



[*.{js,php,vue}]

[*.{js,php,vue,scss}]

indent_style = tab

insert_final_newline = true

.gitignore

+1 −1
Original line number Diff line number Diff line
@@ -93,7 +93,7 @@ CVS/* 
RCS/*



/.project

.php_cs.cache

.php-cs-fixer.cache

.phpunit.result.cache



coverage/

.gitlab-ci.yml

+2 −2
Original line number Diff line number Diff line
@@ -3,8 +3,8 @@ variables: 


include:

  - project: "e/infra/ecloud/nextcloud-apps/ci-templates"

    ref: main

    ref: use-buster-node

    file: "nc-apps-lint-build-frontend.yml"

  - project: "e/infra/ecloud/nextcloud-apps/ci-templates"

    ref: main

    ref: use-buster-node

    file: "nc-apps-deploy.yml"

.nextcloudignore

+2 −1
Original line number Diff line number Diff line
@@ -6,7 +6,8 @@ 
.gitlab-ci.yml

.idea

.nextcloudignore

.php_cs.dist

.php-cs-fixer.dist.php

.php-cs-fixer.cache

.scrutinizer.yml

.stylelintignore

.stylelintrc

.php_cs.dist→.php-cs-fixer.dist.php

+0 −0

File moved.

View file