Merge remote-tracking branch 'mautic/master' into do-not-contact-variable

patrykgruszka · patrykgruszka · commit 4c6fffe884c5 · 2019-12-18T09:15:48.000+01:00
# Conflicts:
#	VARIABLES.md
diff --git a/VARIABLES.md b/VARIABLES.md
@@ -124,8 +124,6 @@ See [customizing preference center][make pref center] for more information.
 | Preferred Channel                                  | `{preferredchannel}`                        |
 | Channel Frequency                                  | `{channelfrequency}`                        |
 | Save Preferences                                   | `{saveprefsbutton}`                         |
-| Unsubscribe Text                                   | `{unsubscribe_text}`                        |
-| Unsubscribe URL                                    | `{unsubscribe_url}`                         |
 | Do Not Contact Text                                | `{donotcontact}`                            |
 
 ## Dynamic Web Content tokens
