-
Merge branch 'dev' of http://git.setisl.com/seti/git-testing into dev · 420ebfa2# Conflicts: # Configuracion_vhost.txt # prueba/.idea/php.xml # prueba/.idea/prueba.iml # prueba/app/Http/Controllers/UserController.php # prueba/composer.lock # prueba/resources/views/layout.blade.php # prueba/resources/views/users/create.blade.php # prueba/resources/views/users/edit.blade.php # prueba/resources/views/users/index.blade.php # prueba/resources/views/users/show.blade.php # prueba/routes/web.php # prueba/tests/Feature/pruebaTest.php
Angello Torres authored
| Name |
Last commit
|
Last update |
|---|---|---|
| prueba | Loading commit data... | |
| Configuracion_vhost.txt | Loading commit data... |