fixed conflicts (eb2698cd) · Commits · go3xgovernment / easyK · GitLab

Skip to content

GitLab

Explore

Sign in
Register

Primary navigation

Project

E

easyK
- Activity
- Members
- Labels
- Issues
  0
- Issue boards
- Milestones
- Wiki
- Releases
- Environments
- Incidents
- Service Desk

Snippets Groups Projects

Admin message

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.

go3xgovernment
easyK
Commits
eb2698cd

Commit eb2698cd authored 9 years ago by

Thea Olivia

Downloads
- Plain Diff

fixed conflicts

parents 544bfed6 045509c9

Changes 16

Expand all Hide whitespace changes

Inline Side-by-side

Showing

README.md 0 additions, 8 deletions

README.md
app/Http/Controllers/KKController.php 29 additions, 3 deletions

app/Http/Controllers/KKController.php
config/app.php 0 additions, 209 deletions

config/app.php
config/auth.php 0 additions, 107 deletions

config/auth.php
config/broadcasting.php 0 additions, 52 deletions

config/broadcasting.php
config/cache.php 0 additions, 81 deletions

config/cache.php
config/compile.php 0 additions, 35 deletions

config/compile.php
config/database.php 0 additions, 120 deletions

config/database.php
config/filesystems.php 0 additions, 67 deletions

config/filesystems.php
config/mail.php 0 additions, 112 deletions

config/mail.php
config/queue.php 0 additions, 86 deletions

config/queue.php
config/services.php 0 additions, 38 deletions

config/services.php
config/session.php 0 additions, 166 deletions

config/session.php
config/view.php 0 additions, 33 deletions

config/view.php
readme.md 6 additions, 1 deletion

readme.md
storage/logs/laravel.log 250 additions, 0 deletions

storage/logs/laravel.log

with 285 additions and 1118 deletions

0% or .

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

Finish editing this message first!

Please register or sign in to comment