Avoid follow SQL conflicts
authorChocobozzz <me@florianbigard.com>
Fri, 10 Jan 2020 10:15:07 +0000 (11:15 +0100)
committerChocobozzz <me@florianbigard.com>
Fri, 10 Jan 2020 12:34:20 +0000 (13:34 +0100)
commitab4d4db44a4f943056b856cbdc7b8d157cabf9af
tree8912ddbeab076e06eecc99f84f9f93c398c0bfc3
parentdb84cf89bcb20b5aaa87f4a6d92d41cc0060a089
Avoid follow SQL conflicts
client/src/app/shared/user-subscription/subscribe-button.component.ts
server/initializers/constants.ts