Merge branch 'MergeSprint2' into 'loginAdmin' (e4c34848) · Commits · Trian Annas T S / WebAlumniSTEI

Snippets Groups Projects

GitLab now enforces expiry dates on tokens that originally had no set expiration date. Those tokens were given an expiration date of one year later. Please review your personal access tokens, project access tokens, and group access tokens to ensure you are aware of upcoming expirations. Administrators of GitLab can find more information on how to identify and mitigate interruption in our documentation.

There was an error fetching the commit references. Please try again later.

Commit e4c34848 authored 7 years ago by

Winarto

Browse files

Merge branch 'MergeSprint2' into 'loginAdmin'

# Conflicts:
#   resources/views/dashboard.blade.php
#   resources/views/members/list.blade.php

parents 53b1d64b b8ac95bf

Expand all Hide whitespace changes

Inline Side-by-side

Showing with 1355 additions and 56 deletions

Please register or to comment

Admin message

Merge branch 'MergeSprint2' into 'loginAdmin'