Merge remote-tracking branch 'origin/master' into custom

This commit is contained in:
Roy Tam 2020-02-27 07:37:41 +08:00
commit 55828393ce
2798 changed files with 8839 additions and 257595 deletions

View file

@ -101,7 +101,6 @@
<td id="buildid-box"></td>
</tr>
#ifndef ANDROID
#ifdef MOZ_UPDATER
<tr class="no-copy">
<th class="column">
@ -115,7 +114,6 @@
</td>
</tr>
#endif
#endif
#ifdef MOZ_UPDATER
<tr>
@ -249,7 +247,6 @@
</td>
</tr>
#ifndef ANDROID
<tr class="no-copy">
<th class="column">
&aboutSupport.appBasicsProfiles;
@ -259,8 +256,6 @@
<a href="about:profiles">about:profiles</a>
</td>
</tr>
#endif
</tbody>
</table>