-
- Downloads
Merge branch 'development' into...
Merge branch 'development' into '1017-dynamic-instructions-for-adding-metager-as-default-search-engine' # Conflicts: # .gitignore
Showing
- .gitignore 2 additions, 3 deletions.gitignore
- app/Console/Commands/RequestFetcher.php 5 additions, 1 deletionapp/Console/Commands/RequestFetcher.php
- app/Http/Controllers/HumanVerification.php 3 additions, 3 deletionsapp/Http/Controllers/HumanVerification.php
- app/Http/Controllers/MetaGerSearch.php 1 addition, 4 deletionsapp/Http/Controllers/MetaGerSearch.php
- app/Http/Middleware/BrowserVerification.php 6 additions, 5 deletionsapp/Http/Middleware/BrowserVerification.php
- app/Http/Middleware/HumanVerification.php 4 additions, 0 deletionsapp/Http/Middleware/HumanVerification.php
- app/MetaGer.php 53 additions, 11 deletionsapp/MetaGer.php
- app/Models/Searchengine.php 1 addition, 0 deletionsapp/Models/Searchengine.php
- app/PrometheusExporter.php 1 addition, 1 deletionapp/PrometheusExporter.php
- chart/templates/deployment.yaml 5 additions, 0 deletionschart/templates/deployment.yaml
- composer.json 0 additions, 1 deletioncomposer.json
- config/database.php 1 addition, 0 deletionsconfig/database.php
- config/trustedproxy.php 1 addition, 0 deletionsconfig/trustedproxy.php
- package-lock.json 0 additions, 11090 deletionspackage-lock.json
- resources/lang/de/partnershops.php 1 addition, 1 deletionresources/lang/de/partnershops.php
- resources/lang/de/team.php 1 addition, 0 deletionsresources/lang/de/team.php
- resources/lang/en/team.php 2 additions, 0 deletionsresources/lang/en/team.php
- resources/lang/es/asso.php 8 additions, 0 deletionsresources/lang/es/asso.php
- resources/lang/es/bitpay.php 2 additions, 4 deletionsresources/lang/es/bitpay.php
- resources/lang/es/index.php 23 additions, 11 deletionsresources/lang/es/index.php
Loading
Please register or sign in to comment