home
calendar
ajie neeeeeh
ajielagi
lagi
ajie lagi
Merge branch 'master' of https://github.com/taufansatrio/PINTAR

Conflicts:
	.gitignore
	PINTARApp/src/java/DatabaseModel/DBManager.java
	PINTARApp/web/index.jsp
	PINTARApp/web/login.jsp
	PINTARApp/web/style.css
Merge branch 'master' of https://github.com/taufansatrio/PINTAR

Conflicts:
	.gitignore
	PINTARApp/nbproject/build-impl.xml
	PINTARApp/nbproject/genfiles.properties
	PINTARApp/nbproject/project.properties
	PINTARApp/nbproject/project.xml
	PINTARApp/src/java/DatabaseModel/DBManager.java
	PINTARApp/web/index.jsp
	PINTARApp/web/login.jsp
	PINTARApp/web/style.css
Merge branch 'master' of https://github.com/taufansatrio/PINTAR

Conflicts:
	.gitignore
	PINTARApp/nbproject/build-impl.xml
	PINTARApp/nbproject/genfiles.properties
	PINTARApp/nbproject/project.properties
	PINTARApp/nbproject/project.xml
	PINTARApp/src/java/DatabaseModel/DBManager.java
	PINTARApp/web/index.jsp
	PINTARApp/web/login.jsp
	PINTARApp/web/style.css