Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Resolve conflicts with hawthorn/main 20221004 #1290

Open
wants to merge 5 commits into
base: main
Choose a base branch
from
Open

Resolve conflicts with hawthorn/main 20221004 #1290

wants to merge 5 commits into from

Commits on Nov 2, 2021

  1. feat: Add Mandrill Subaccount support

    @amirtds
    amirtds committed Nov 2, 2021
    Configuration menu
    Copy the full SHA
    c031197 View commit details
    Browse the repository at this point in the history

  2. Update settings.ANYMAIL if it already exists

    @amirtds
    amirtds committed Nov 2, 2021
    Configuration menu
    Copy the full SHA
    f082735 View commit details
    Browse the repository at this point in the history

Commits on Nov 3, 2021

  1. Read MANDRILL_SUBACCOUNT ID from ENV_TOKENS

    @amirtds
    amirtds committed Nov 3, 2021
    Configuration menu
    Copy the full SHA
    8a2be19 View commit details
    Browse the repository at this point in the history

Commits on Nov 4, 2021

  1. Merge pull request #1035 from appsembler/hawthorn/feature/anyemail-su… 

    …pport

feat: Add Mandrill Subaccount support
    @amirtds
    amirtds authored Nov 4, 2021
    Configuration menu
    Copy the full SHA
    d7caccc View commit details
    Browse the repository at this point in the history

Commits on Oct 5, 2022

  1. Merge branch 'hawthorn/main' into shadinaif/resolve-conflicts-20221004

    @shadinaif
    shadinaif committed Oct 5, 2022
    Configuration menu
    Copy the full SHA
    78c9f5d View commit details
    Browse the repository at this point in the history