diff options
author | wolfbeast <mcwerewolf@gmail.com> | 2018-02-05 12:41:16 +0100 |
---|---|---|
committer | wolfbeast <mcwerewolf@gmail.com> | 2018-02-05 12:41:16 +0100 |
commit | 2d652d1c355c8bdde03a6c278b5b7b444424e394 (patch) | |
tree | 0ea18eabc7d3cdec78e59701e10e15a662af6641 /browser/config | |
parent | 2782832f265a8e0a7923ca885b431907cde7cc49 (diff) | |
parent | e8417003899a4ec9274815be30352c1328fc32e9 (diff) | |
download | UXP-2d652d1c355c8bdde03a6c278b5b7b444424e394.tar UXP-2d652d1c355c8bdde03a6c278b5b7b444424e394.tar.gz UXP-2d652d1c355c8bdde03a6c278b5b7b444424e394.tar.lz UXP-2d652d1c355c8bdde03a6c278b5b7b444424e394.tar.xz UXP-2d652d1c355c8bdde03a6c278b5b7b444424e394.zip |
Merge branch 'master' into ported-upstream
Diffstat (limited to 'browser/config')
-rw-r--r-- | browser/config/version.txt | 2 | ||||
-rw-r--r-- | browser/config/version_display.txt | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/browser/config/version.txt b/browser/config/version.txt index 4e9247c69..b406fbef6 100644 --- a/browser/config/version.txt +++ b/browser/config/version.txt @@ -1 +1 @@ -52.6.0 +55.0.0 diff --git a/browser/config/version_display.txt b/browser/config/version_display.txt index 4e9247c69..b406fbef6 100644 --- a/browser/config/version_display.txt +++ b/browser/config/version_display.txt @@ -1 +1 @@ -52.6.0 +55.0.0 |