Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/1.0' into 2.0
Browse files Browse the repository at this point in the history
# Conflicts:
#	src/bundle/Controller/PasswordResetController.php
#	src/bundle/Resources/config/services/controllers.yaml
#	src/bundle/Resources/views/Security/mail/forgot_user_password.html.twig
  • Loading branch information
mateuszdebinski committed May 13, 2020
2 parents 3857004 + 583bbd6 commit f692ef3
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 2 deletions.
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ script:
notifications:
slack:
rooms:
- secure: WHaF3LihH1WgOrdo7XCVooAjCED48eBo5T7wuDLIHxZzEHZnRx+cwUe0ta4/m/hjAl1kXmfay0nwCnvjEPCOGN45SnA5yAOVsR0ExFr9QYCUlh967a5a6ckagdO6S8alqFmVaUhhTrfLOO4yorr7cdHr0n3l0U/vm4QA3+40vPsZH4C7+Z80i9EFt2IPGzwDamVIXGaBS5AkJyYYT9PAwv2XYdUJDy+jWP0a1w2PbCWGzGLnIYJ472kzzUfPMoTmNpqRkvTyoNToJ+mfW24FssjB05eLwbcy8FDBYH+BrM88uKG6TgAyAOfUuA/EzMooe5cQs3faneExFxxt3aLwRde3OLJJtNUFCNwRUqD3IXQCDZVlqUfkuo0/2NTjeDAb08qNOyi0/dCBLYedeOEfYqGhhc7WYITKHTtXKCQMI4GbMxWVDMSo9wpXgoaCwCVP5LBbiHrwe5Vr4NzQmOwwcIC4IGVW2z2GT1JQ5uahMJ1klITlxn+rCBdE8dde6OFVNiS7UUnI7r6hMHoaUlWV8n1pb8cYH9ZubEUjZzZ5RFu8cFX/Q52Rk3n5AYSWIqcMF94sGj1TsHw2b+ex+GWYMVhXQ1hvx2YwF5PtMY9oKuzcwntAKYvNWMIdBU8M4UFdLxChSBwcNhJPQ9435qlgNkee/836d1FuL42LCyfvi8I=
- secure: EaR+jN0IrmT71U6ahNLepHApB3A6PXlPwK+hwaMcId1c1IuwcalACMYNIqjIQr0cvHpTH7PGM2TtR648i9hRn+CrGDZZU6448T5Vh72E+1KiZ79rXByHr/a27onp5Lx5NSKlSila/bjWT+qsvJ/fUy+RLK42vVVCUrdbE2hvwLoOvUtiaPVyJU+TXzq9uIERoS+lknwVP/HMbXQ8k3h25GVD4MgYHZZ3mk1s62mef+EUwdXi11CoHsCoU4+equTyXv6W2xir7JWjgegTsoCepr+kL4U5hJt9zugi6Q+S8gHBCTQd3d+tgNq/Hbyp3cYh/ewldpSiO8otLUj94Z+8r9GNiMITkAf/Hv1srY4pBsKXKWYkrkWJdOKsvaSIiRkDiwdBe+ZFg7td/HsUsbtGBmzYcn7RLbx1zy6kTQz/qZShqgBMiaDx10f4N0O53x4B5n6PlvjiM6OixPjzlAqF/4WLhzp0hYn7aHvCalb867J7vLnc1+chYpvidAuj10xhoY1ndviCVT8aCm0Vt6yzQe+3Qu5/Zq6Zgmv8IfxTDdCtouBqZJ83OpzZw9gReFdZvx/+7/PFcLPNqCp7v104z9M7EFSn/ZFuy1XmFF5H3bGNRYRiSVDYwdisrQnMXNbUYjpqoYGB7fqYvB5JwXwhT7VBvUy4LptvCkMjLDLUF2o=
on_success: change
on_failure: always
on_pull_requests: false
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
{% trans_default_domain 'forgot_password' %}

{%- block from -%}
noreply@domain.com
{%- endblock from -%}

{%- block subject -%}
Expand Down

0 comments on commit f692ef3

Please # to comment.