diff options
author | Jos Poortvliet <jospoortvliet@gmail.com> | 2017-02-25 17:43:34 +0300 |
---|---|---|
committer | Jos Poortvliet <jospoortvliet@gmail.com> | 2017-02-25 17:43:34 +0300 |
commit | fa2a867dbff5678de3012ce11c1904e200245510 (patch) | |
tree | 3b033ce5be1a049b851f34dcaeb787994c258ebb /base.php | |
parent | 47649c86010a706fc1ac63399d7c18ff376606ee (diff) | |
parent | 945732d0ce60e1eba946f0858e591c0a753731c4 (diff) |
Merge branch 'master' into features
Diffstat (limited to 'base.php')
-rw-r--r-- | base.php | 13 |
1 files changed, 8 insertions, 5 deletions
@@ -23,7 +23,7 @@ if(is_page('oc-news') || is_page('blogfeed')) { $oldPages = [ '404', '5years', - 'about', +// 'about', 'advisories', 'advisory', 'agreement', @@ -34,7 +34,7 @@ if(is_page('oc-news') || is_page('blogfeed')) { 'apply2', 'changelog', 'code-of-conduct', - 'collaboraonline', +// 'collaboraonline', 'community', 'conf', 'conference-program', @@ -45,11 +45,12 @@ if(is_page('oc-news') || is_page('blogfeed')) { 'contact', 'contactform', 'contactsubmit', - 'contributors', +// 'contribute', +// 'contributors', 'design', 'desktop', 'devices', - 'events', +// 'events', 'faq', 'federation', 'hackathon', @@ -89,9 +90,11 @@ if(is_page('oc-news') || is_page('blogfeed')) { 'sharing', 'speaking', 'spreedbox', - 'team', +// 'support', +// 'team', 'thanks', 'thankyou', + 'ordersubmit', 'theming', 'threat-model', 'trademarks', |