Merge branch 'master' of github.com:flatlogic/light-blue-react into master

Author: yurykurylovich

changelog.md

@@ -1,5 +1,9 @@
 # Changelog
 
+## [8.1.1]
+
+- Added link to flatlogic on login page
+
 ## [8.1.0]
 
 - Updated all dependencies, cleaned up dependency tree

src/pages/auth/forgot/Forgot.js

@@ -68,7 +68,7 @@ class Forgot extends React.Component {
             </Widget>
           </Container>
           <footer className="auth-footer">
-            {new Date().getFullYear()} &copy; Light Blue React.
+            {new Date().getFullYear()} &copy; Light Blue - React Admin Dashboard Template. Made by <a href="https://flatlogic.com" rel="noopener noreferrer" target="_blank">Flatlogic LLC</a>
           </footer>
         </div>
       );

src/pages/auth/register/Register.js

@@ -156,7 +156,7 @@ class Register extends React.Component {
                     </Widget>
                 </Container>
                 <footer className="auth-footer">
-                    {new Date().getFullYear()} &copy; Light Blue React.
+                    {new Date().getFullYear()} &copy; Light Blue - React Admin Dashboard Template. Made by <a href="https://flatlogic.com" rel="noopener noreferrer" target="_blank">Flatlogic LLC</a>
                 </footer>
             </div>
         );

src/pages/auth/reset/Reset.js

@@ -117,7 +117,7 @@ class Reset extends React.Component {
             </Widget>
           </Container>
           <footer className="auth-footer">
-            {new Date().getFullYear()} &copy; Light Blue React.
+            {new Date().getFullYear()} &copy; Light Blue - React Admin Dashboard Template. Made by <a href="https://flatlogic.com" rel="noopener noreferrer" target="_blank">Flatlogic LLC</a>
           </footer>
         </div>
       );

src/pages/error/ErrorPage.js

@@ -35,7 +35,11 @@ class ErrorPage extends React.Component {
             </Form>
           </div>
           <footer className={s.pageFooter}>
+<<<<<<< HEAD
             2020 &copy; Light Blue - React Admin Dashboard Template.
+=======
+          {new Date().getFullYear()} &copy; Light Blue - React Admin Dashboard Template. Made by <a href="https://flatlogic.com" rel="noopener noreferrer" target="_blank">Flatlogic LLC</a>
+>>>>>>> 9e9aa184c64f1550cc100a583c8251a056bf1742
           </footer>
         </Container>
       </div>

src/pages/login/Login.js

@@ -157,7 +157,11 @@ class Login extends React.Component {
                     </Widget>
                 </Container>
                 <footer className="auth-footer">
+<<<<<<< HEAD
                     2020 &copy; Light Blue - React Admin Dashboard Template.
+=======
+                {new Date().getFullYear()} &copy; Light Blue - React Admin Dashboard Template. Made by <a href="https://flatlogic.com" rel="noopener noreferrer" target="_blank">Flatlogic LLC</a>
+>>>>>>> 9e9aa184c64f1550cc100a583c8251a056bf1742
                 </footer>
             </div>
         );