Merge branch 'web-manifest' of github.com:illinois/queue into web-man…

…ifest
illinois · Mar 3, 2018 · b34cad8 · b34cad8
2 parents d3d393e + 0bd4e16
commit b34cad8
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 3 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -11,8 +11,12 @@ with the current date and the next changes should go under a **[Next]** header.
 * Add Travis and Prettier support. ([@nwalters512](https://github.com/nwalters512) in [#37](https://github.com/illinois/queue/pull/37))
 * Allow course staff to see netids next to student name. ([@genevievehelsel](https://github.com/genevievehelsel) in [#32](https://github.com/illinois/queue/pull/32))
 * Automatically redirect to a current queue or course page if visiting a closed queue. ([@Muakasan](https://github.com/Muakasan) in [#40](https://github.com/illinois/queue/pull/40))
+<<<<<<< HEAD
 * Add web manifest for "Add to Home Screen" on Android. ([@shreyas208](https://github.com/shreyas208) in [#29](https://github.com/illinois/queue/pull/29))
-
+=======
+* Rebrand from CS@Illinois Queues to Queues@Illinois. ([@genevievehelsel](https://github.com/genevievehelsel) in [#42](https://github.com/illinois/queue/pull/42))
+* Add web manifest for "Add to Home Screen" on Android. ([@shreyas208](https://github.com/shreyas208) in [#24](https://github.com/illinois/queue/pull/29))
+>>>>>>> 0bd4e1638a1eaacf3cbe388fd911d424ec436d3e
 
 ## 27 February 2018
 

diff --git a/components/Header.js b/components/Header.js
@@ -40,7 +40,7 @@ class Header extends React.Component {
     return (
       <Navbar color="dark" dark className="mb-3" expand="sm">
         <Link route="index" passHref>
-          <NavbarBrand>CS@Illinois Queues</NavbarBrand>
+          <NavbarBrand>Queues@Illinois</NavbarBrand>
         </Link>
         <NavbarToggler onClick={() => this.toggle()} />
         {user && (

diff --git a/pages/_document.js b/pages/_document.js
@@ -46,7 +46,7 @@ export default class MyDocument extends Document {
             href={manifestPath}
           />
           <style>{FontAwesome.dom.css()}</style>
-          <title>CS@Illinois Queues</title>
+          <title>Queues@Illinois</title>
           <link rel="icon" href={faviconPath} type="image/png" />
           {baseUrl && <script dangerouslySetInnerHTML={script} />}
         </Head>