index
Merge branch 'development' of https://github.com/egisolehhasdi/Website-SMKN-4-Bandung into development

Conflicts:
	application/views/scripts/profil/index.phtml
ga ada konflik
Merge branch 'development' of https://github.com/egisolehhasdi/Website-SMKN-4-Bandung into development

Conflicts:
	application/cache/zend_cache---0ccb32345202a9ce0d883f3d6a476268
	application/cache/zend_cache---734910fe7ac987d04d66ffebf9541319
	application/cache/zend_cache---90a08d73188429318350825da8f94427
	application/cache/zend_cache---cbf5863d2619ae95e6c13674b8b4209f
	application/cache/zend_cache---internal-metadatas---0786655487fa1546513fa28cde1f5327
	application/cache/zend_cache---internal-metadatas---0a95013c2a4aa0b846b94c4072b1f049
	application/cache/zend_cache---internal-metadatas---0ccb32345202a9ce0d883f3d6a476268
	application/cache/zend_cache---internal-metadatas---324fab9ccabf2141d24e04a30d7c85ce
	application/cache/zend_cache---internal-metadatas---734910fe7ac987d04d66ffebf9541319
	application/cache/zend_cache---internal-metadatas---90a08d73188429318350825da8f94427
	application/cache/zend_cache---internal-metadatas---cbf5863d2619ae95e6c13674b8b4209f
	application/cache/zend_cache---internal-metadatas---cf42ddea38c39d2970ab8366adf6ae32
	application/cache/zend_cache---internal-metadatas---f78d064897f78b3a5bee327e08ad83a6
	application/views/scripts/profile/index.phtml
Merge branch 'development' of https://github.com/egisolehhasdi/Website-SMKN-4-Bandung into development
sudah
ok
Merge branch 'development' of https://github.com/egisolehhasdi/Website-SMKN-4-Bandung into development

Conflicts:
	.gitignore
	application/cache/zend_cache---internal-metadatas---0786655487fa1546513fa28cde1f5327
	application/cache/zend_cache---internal-metadatas---0a95013c2a4aa0b846b94c4072b1f049
	application/cache/zend_cache---internal-metadatas---324fab9ccabf2141d24e04a30d7c85ce
	application/cache/zend_cache---internal-metadatas---cf42ddea38c39d2970ab8366adf6ae32
Merge branch 'development' of https://github.com/egisolehhasdi/Website-SMKN-4-Bandung into development

Conflicts:
	application/cache/zend_cache---internal-metadatas---0786655487fa1546513fa28cde1f5327
	application/cache/zend_cache---internal-metadatas---0a95013c2a4aa0b846b94c4072b1f049
	application/cache/zend_cache---internal-metadatas---324fab9ccabf2141d24e04a30d7c85ce
	application/cache/zend_cache---internal-metadatas---cf42ddea38c39d2970ab8366adf6ae32
Merge branch 'development' of https://github.com/egisolehhasdi/Website-SMKN-4-Bandung into development
commit
Merge branch 'development' of https://github.com/egisolehhasdi/Website-SMKN-4-Bandung into development

Conflicts:
	application/cache/zend_cache---internal-metadatas---0786655487fa1546513fa28cde1f5327
	application/cache/zend_cache---internal-metadatas---0a95013c2a4aa0b846b94c4072b1f049
	application/cache/zend_cache---internal-metadatas---0ccb32345202a9ce0d883f3d6a476268
	application/cache/zend_cache---internal-metadatas---324fab9ccabf2141d24e04a30d7c85ce
	application/cache/zend_cache---internal-metadatas---734910fe7ac987d04d66ffebf9541319
	application/cache/zend_cache---internal-metadatas---90a08d73188429318350825da8f94427
	application/cache/zend_cache---internal-metadatas---cbf5863d2619ae95e6c13674b8b4209f
	application/cache/zend_cache---internal-metadatas---cf42ddea38c39d2970ab8366adf6ae32
	application/cache/zend_cache---internal-metadatas---f78d064897f78b3a5bee327e08ad83a6
Merge branch 'development' of https://github.com/egisolehhasdi/Website-SMKN-4-Bandung into development

Conflicts:
	application/cache/zend_cache---0ccb32345202a9ce0d883f3d6a476268
	application/cache/zend_cache---90a08d73188429318350825da8f94427
	application/cache/zend_cache---cbf5863d2619ae95e6c13674b8b4209f
	application/cache/zend_cache---internal-metadatas---0786655487fa1546513fa28cde1f5327
	application/cache/zend_cache---internal-metadatas---0a95013c2a4aa0b846b94c4072b1f049
	application/cache/zend_cache---internal-metadatas---0ccb32345202a9ce0d883f3d6a476268
	application/cache/zend_cache---internal-metadatas---324fab9ccabf2141d24e04a30d7c85ce
	application/cache/zend_cache---internal-metadatas---734910fe7ac987d04d66ffebf9541319
	application/cache/zend_cache---internal-metadatas---90a08d73188429318350825da8f94427
	application/cache/zend_cache---internal-metadatas---cbf5863d2619ae95e6c13674b8b4209f
	application/cache/zend_cache---internal-metadatas---cf42ddea38c39d2970ab8366adf6ae32
	application/cache/zend_cache---internal-metadatas---f78d064897f78b3a5bee327e08ad83a6
	application/configs/application.ini