Merge branch 'fakela-mobile'

deleted boostrap.min.css,resolved conflicts
samswag · Jan 20, 2019 · d47f860 · d47f860
2 parents 8257f85 + 86785e0
commit d47f860
Show file tree

Hide file tree

Showing 31 changed files with 179 additions and 8,380 deletions.
diff --git a/about.html b/about.html
diff --git a/assets/css/bootsnav.css b/assets/css/bootsnav.css
diff --git a/assets/css/bootstrap.min.css b/assets/css/bootstrap.min.css
diff --git a/assets/images/about-img1.jpg b/assets/images/about-img1.jpg
diff --git a/assets/images/cbrand-img1.png b/assets/images/cbrand-img1.png
diff --git a/assets/images/cbrand-img2.png b/assets/images/cbrand-img2.png
diff --git a/assets/images/cbrand-img3.png b/assets/images/cbrand-img3.png
diff --git a/assets/images/cbrand-img4.png b/assets/images/cbrand-img4.png
diff --git a/assets/images/cbrand-img5.png b/assets/images/cbrand-img5.png
diff --git a/assets/images/cbrand-img6.png b/assets/images/cbrand-img6.png
diff --git a/assets/images/footer-logo.png b/assets/images/footer-logo.png
diff --git a/assets/images/home-bg.jpg b/assets/images/home-bg.jpg
diff --git a/assets/images/logo.png b/assets/images/logo.png
diff --git a/assets/images/ltst-img-1.jpg b/assets/images/ltst-img-1.jpg
diff --git a/assets/images/ltst-img-2.jpg b/assets/images/ltst-img-2.jpg
diff --git a/assets/images/ltst-img-3.jpg b/assets/images/ltst-img-3.jpg
diff --git a/assets/images/test-img1.jpg b/assets/images/test-img1.jpg
diff --git a/assets/images/test-img2.jpg b/assets/images/test-img2.jpg
diff --git a/assets/images/work-img1.jpg b/assets/images/work-img1.jpg
diff --git a/assets/images/work-img2.jpg b/assets/images/work-img2.jpg
diff --git a/assets/images/work-img3.jpg b/assets/images/work-img3.jpg
diff --git a/assets/images/work-img4.jpg b/assets/images/work-img4.jpg
diff --git a/css/bootstrap.css b/css/bootstrap.css
diff --git a/css/bootstrap.min.css b/css/bootstrap.min.css
diff --git a/css/bootstrap.min.css.map b/css/bootstrap.min.css.map
diff --git a/css/maps/home.css.map b/css/maps/home.css.map
diff --git a/css/maps/landing-page.css.map b/css/maps/landing-page.css.map
diff --git a/css/maps/style.css.map b/css/maps/style.css.map