Merge branch 'master' into feat/build-lists

# Conflicts:
#	package-lock.json
This commit is contained in:
Sam Carlton 2021-03-02 19:32:16 -06:00
commit a7551e1dd8
46 changed files with 3164 additions and 7153 deletions

View file

@ -25,7 +25,7 @@
</div>
</div>
<p class="mt-8 text-center text-base leading-6 text-gray-400">
&copy; 2020 Does it ARM All rights reserved.
&copy; {{ currentYear }} Does it ARM All rights reserved.
</p>
</div>
</footer>
@ -49,6 +49,11 @@ export default {
components: {
Navbar,
AllUpdatesSubscribe
},
computed: {
currentYear () {
return new Date().getFullYear()
}
}
}