Merge branch 'master' of https://gitlab.del.ac.id/Franciskus_Napitupulu/PA1-1617-D3TI107
# Conflicts:
# addarticle_process.php
# allarticle.php
# allbook.php
# categories.php
# deletearticle_process.php
# deleteprofile_process.php
# editarticle.php
# editarticle_process.php
# editbook_process.php
# editprofile_process.php
# header.php
# images/Tembakau Bagi Penderita Diabet.jpg
# index.php
# processarticle.php
# processbook.php
# publisher.php
# savebook.php
# toko_buku_cemerlang.sql
Showing
images/arrow.png
deleted
100644 → 0
3.22 KB
images/cemerlang.jpg
deleted
100644 → 0
This diff is collapsed.
Click to expand it.
images/check.png
deleted
100644 → 0
2.83 KB
images/close_1.png
deleted
100644 → 0
3.15 KB
images/edit.png
deleted
100644 → 0
856 Bytes
images/icon1.png
deleted
100644 → 0
2.91 KB
images/icon2.png
deleted
100644 → 0
2.9 KB
images/logo.png
deleted
100644 → 0
7.39 KB
images/minus.png
deleted
100644 → 0
652 Bytes
images/offer.png
deleted
100644 → 0
3.16 KB
images/plus.png
deleted
100644 → 0
697 Bytes
images/slider1.jpg
deleted
100644 → 0
74.6 KB
images/slider2.jpg
deleted
100644 → 0
35.9 KB
images/slider3.jpg
deleted
100644 → 0
136 KB
images/slider4.jpg
deleted
100644 → 0
46.7 KB
images/tambah.png
deleted
100644 → 0
521 Bytes
images/tick.png
deleted
100644 → 0
2.85 KB
This diff is collapsed.
Click to expand it.