Skip to main content

Primary navigation

Project

IES Bandung
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Releases
- Model registry
- Environments
- Incidents

Snippets Groups Projects

AceOneworks
IES Bandung
Commits
074befd8

Commit 074befd8 authored Apr 7, 2016 by David

Downloads
- Plain Diff

Merge branch 'master' of http://gitlab.informatika.org/AceOneworks/templatePPL2

Conflicts:
	IES-Bandung/app/Http/Controllers/VendorUserController.php

parents 36ee5368 1c79c4a4

Branches

Tags

Loading

Checking pipeline status

Changes 4
Pipelines 1

Show whitespace changes

Inline Side-by-side

Showing

IES-Bandung/app/Http/Controllers/VendorUserController.php 3 additions, 3 deletions

IES-Bandung/app/Http/Controllers/VendorUserController.php
IES-Bandung/public/img/pasar.png 0 additions, 0 deletions

IES-Bandung/public/img/pasar.png
IES-Bandung/resources/views/auth/login.blade.php 3 additions, 1 deletion

IES-Bandung/resources/views/auth/login.blade.php
IES-Bandung/resources/views/vendorUser.blade.php 3 additions, 3 deletions

IES-Bandung/resources/views/vendorUser.blade.php

with 9 additions and 7 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please sign in to comment