cambios por jorge1 - #62

Open

Alejo1967 wants to merge 218 commits into

githubtraining:mainfrom

OmarVasquez:Branchjorge

Commits on May 7, 2024

Mi cambio Heidi
Heidi Sanchez
committed
68c8536
Mi cambio en readme ovasquez
OmarVasquez
committed
daf36dd
Ajuste el readme
pedrorozoc
committed
bfb5c40
modificacion
jbalcerol
committed
4d075a7
cambio de prueba
jcortesl
committed
63e3e88
cambios por jorge
jorgeduardo61
committed
f49c453
Cambio en readme
davidVel321
committed
b7921fa
Segundo cambio
LuisGustavoTamayoM
committed
59939a1
cambio en readme nreyes
Rafanix7
committed
6631dde
Merge branch 'branchRene' into DevDavid
jbalcerol
authored
ef83a2e
Merge pull request #17 from OmarVasquez/Branchjorge
jorgeduardo61
authored
efd94da
Merge pull request #21 from OmarVasquez/branchalejo
Alejo1967
authored
eaaad59
Merge branch 'prozoc' into heidi
OmarVasquez
authored
98d9568
Merge branch 'jcortesl' into GustavoT
LuisGustavoTamayoM
authored
17d7f13
Merge pull request #4 from OmarVasquez/GustavoT
LuisGustavoTamayoM
authored
1b02e7e
Merge pull request #6 from OmarVasquez/heidi
heidisanchc
authored
21473b1
NUEVO CAMBIO
davidVel321
committed
48b00d2
hola
Alejo1967
committed
4990d55
Merge branch 'branchalejo' of https://github.com/OmarVasquez/caption-this-dian1 into branchalejo
Alejo1967
committed
294fa94
Merge pull request #26 from OmarVasquez/branchalejo
Alejo1967
authored
81ea12a
Cambio Z
davidVel321
committed
543e020
Modificacion README ovasquez
OmarVasquez
committed
fdf6981
Cambios v2
OmarVasquez
committed
ad448df
cambios v2
pedrorozoc
committed
2fdd2c4
Cambios v3
OmarVasquez
committed
b7b3330
comentario commit
jorgeduardo61
committed
d7e7ba3
otro commit
jorgeduardo61
committed
e0be030
cambio vscode
davidVel321
committed
6cf1899
corrección
jorgeduardo61
committed
8d54485
VSTUDIO
jcortesl
committed
4f4e79d
Comit hecho
LuisGustavoTamayoM
committed
675f1f0
cambio edison
jcortesl
committed
87fb329
resolucion de conflictos
LuisGustavoTamayoM
committed
6d88169
Cambio local ovasquez
OmarVasquez
committed
62fcd7f
cambio 1
apereap2017
committed
1ec1ee0
para merge
karlosegura
committed
aaf94bc
Cambio desde github.com
OmarVasquez
authored
ee3582f
Merge branch 'dev' of https://github.com/OmarVasquez/caption-this-dian1 into dev
OmarVasquez
committed
8ffc828
Update README.md
CarlosPor
authored
685db13
Merge branch 'dev' of https://github.com/OmarVasquez/caption-this-dian1 into dev
karlosegura
committed
a8b62c9
Cambio Heidi
heidisanchc
authored
1ff0d36
test merge
karlosegura
committed
033935c
subir 1
apereap2017
committed
2b0f75e
Agrega facilitador
jbalcerol
committed
8935608
Cambio DevDavid
davidVel321
committed
c99cd88
Agrega facilitador
jbalcerol
committed
fb12e15
Update README.md
pedrorozoc
authored
e91c951
Pruebas....
Heidi Sanchez
committed
4cdef99
cambio en dev jlopezr2
jonathanlr87
committed
33aca2e
Prueba conflicto
JCgmv
committed
8def4fa
Merge branch 'dev' of https://github.com/OmarVasquez/caption-this-dian1 into dev
karlosegura
committed
1305ba7
Merge branch 'dev' of https://github.com/OmarVasquez/caption-this-dian1 into dev
apereap2017
committed
ed7e372
Merge branch 'dev' of https://github.com/OmarVasquez/caption-this-dian1 into dev
karlosegura
committed
454f10c
agrego prozoc local
pedrorozoc
committed
bfa8310
COMMIT DE JORGE
jorgeduardo61
committed
007e80a
Ajuste eggp73
eggp73
committed
82cf97b
Update README.md
79428884
authored
aa762fe
Merge branch 'dev' of https://github.com/OmarVasquez/caption-this-dian1 into dev
Heidi Sanchez
committed
38b5373
Merge branch 'dev' of https://github.com/OmarVasquez/caption-this-dian1 into dev
apereap2017
committed
3274bca
Este earchivo de pruebas
CarlosPor
committed
3fce41b
Merge branch 'dev' of https://github.com/OmarVasquez/caption-this-dian1 into dev
apereap2017
committed
894306c
Update README.md
afarenasde
authored
0d2ad6a
Merge branch 'dev' of https://github.com/OmarVasquez/caption-this-dian1 into dev
pedrorozoc
committed
43de349
cambio jcortes
jcortesl
authored
37b36ca
Merge branch 'dev' of https://github.com/OmarVasquez/caption-this-dian1 into dev
Heidi Sanchez
committed
1792463
test merge 2
karlosegura
committed
7396590
Merge branch 'dev' of https://github.com/OmarVasquez/caption-this-dian1 into dev
Heidi Sanchez
committed
ada70e0
Dev David GitHub.com
davidVel321
authored
19903c6
Merge branch 'dev' of https://github.com/OmarVasquez/caption-this-dian1 into dev
pedrorozoc
committed
0af7c17
Merge branch 'dev' of https://github.com/OmarVasquez/caption-this-dian1 into dev
jorgeduardo61
committed
da07094
Merge branch 'dev' of https://github.com/OmarVasquez/caption-this-dian1 into dev
karlosegura
committed
406955b
Merge branch 'dev' of https://github.com/OmarVasquez/caption-this-dian1 into dev
karlosegura
committed
2cda447
Merge branch 'dev' of https://github.com/OmarVasquez/caption-this-dian1 into dev
pedrorozoc
committed
172a680
Merge branch 'dev' of https://github.com/OmarVasquez/caption-this-dian1 into dev
pedrorozoc
committed
7e619b8
laboratorio3 conflictos
lidaarciniegasr
committed
198d75e
Merge branch 'dev' of https://github.com/OmarVasquez/caption-this-dian1 into dev
jorgeduardo61
committed
469d147
Merge branch 'dev' of https://github.com/OmarVasquez/caption-this-dian1 into dev
jorgeduardo61
committed
40eb045
cambio abajo
afarenasde
committed
1434910
Prueba de conflicto
MarciarellY71
committed
c313153
Commit jcollante
jairocollante
committed
985f00b
Merge branch 'dev' of http://github.com/Omarvasquez/caption-this-dian1 into dev
eggp73
committed
a9b502e
Merge branch 'dev' of https://github.com/OmarVasquez/caption-this-dian1 into dev
JCgmv
committed
7da6af1
Update README.md Tamagol
LuisGustavoTamayoM
authored
08df570
Merge branch 'dev' of https://github.com/OmarVasquez/caption-this-dian1 into dev
JCgmv
committed
a1de662
Merge branch 'dev' of https://github.com/OmarVasquez/caption-this-dian1 into dev
JCgmv
committed
7959434
Ajuste eggp
eggp73
committed
f936bb3
cambio vs jcortes
jcortesl
committed
9bca0d9
Merge branch 'dev' of https://github.com/OmarVasquez/caption-this-dian1 into dev
MarciarellY71
committed
c0b41be
Merge branch 'dev' of https://github.com/OmarVasquez/caption-this-dian1 into dev
jairocollante
committed
6fc4130
adios tamagol
karlosegura
committed
f47bd69
Update README.md tamaguchi
LuisGustavoTamayoM
authored
490ed7c
Merge branch 'dev' of http://github.com/Omarvasquez/caption-this-dian1 into dev
eggp73
committed
51c4ccb
Merge branch 'dev' of https://github.com/OmarVasquez/caption-this-dian1 into dev
jairocollante
committed
08c9850
Merge branch 'dev' of http://github.com/Omarvasquez/caption-this-dian1 into dev
eggp73
committed
b88e9e8
Merge branch 'dev' of https://github.com/OmarVasquez/caption-this-dian1 into dev
karlosegura
committed
1b3717c
Merge branch 'dev' of https://github.com/OmarVasquez/caption-this-dian1 into dev
karlosegura
committed
f840d0b
Merge branch 'dev' of https://github.com/OmarVasquez/caption-this-dian1 into dev
afarenasde
committed
d199962
Cambio all
davidVel321
committed
f65f235
Merge branch 'dev' of https://github.com/OmarVasquez/caption-this-dian1 into dev
MarciarellY71
committed
2248ab4
Merge branch 'dev' of https://github.com/OmarVasquez/caption-this-dian1 into dev
jbalcerol
committed
f532187
Merge branch 'dev' of https://github.com/OmarVasquez/caption-this-dian1 into dev
davidVel321
committed
e52259e
Cambio XXX
Heidi Sanchez
committed
4970623
Ajuste eggp
eggp73
committed
958fad1
JPRGE AGAIN
jorgeduardo61
committed
b51bed2
Merge branch 'dev' of https://github.com/OmarVasquez/caption-this-dian1 into dev
Heidi Sanchez
committed
e4dbb70
Merge branch 'dev' of https://github.com/OmarVasquez/caption-this-dian1 into dev
jorgeduardo61
committed
cc207da
Merge branch 'dev' of http://github.com/Omarvasquez/caption-this-dian1 into dev
eggp73
committed
5d7ab15
Merge branch 'dev' of https://github.com/OmarVasquez/caption-this-dian1 into dev
MarciarellY71
committed
e317a1b
Merge branch 'dev' of https://github.com/OmarVasquez/caption-this-dian1 into dev
lidaarciniegasr
committed
edafb34
Ajuste eggp
eggp73
committed
1fcb801
Merge branch 'dev' of https://github.com/OmarVasquez/caption-this-dian1 into dev
jbalcerol
committed
1aea698
test 5 merge
karlosegura
committed
5e76d38
OTRA
jorgeduardo61
committed
edec19c
Merge branch 'dev' of https://github.com/OmarVasquez/caption-this-dian1 into dev
karlosegura
committed
b39595e
mensaje comin https://github.com/OmarVasquez/caption-this-dian1 into dev
jcortesl
committed
40759f6
Merge branch 'dev' of https://github.com/OmarVasquez/caption-this-dian1 into dev
jbalcerol
committed
93c93d1
Merge branch 'dev' of https://github.com/OmarVasquez/caption-this-dian1 into dev
jcortesl
committed
19d1052
Ajmjuste eggp
eggp73
committed
b0ce701
Merge branch 'dev' of https://github.com/OmarVasquez/caption-this-dian1 into dev
CarlosPor
committed
8bd07b3
Merge branch 'dev' of https://github.com/OmarVasquez/caption-this-dian1 into dev
afarenasde
committed
a1baf8b
Ajustre eggp
eggp73
committed
6bbd458
Merge branch 'dev' of https://github.com/OmarVasquez/caption-this-dian1 into dev
jonathanlr87
committed
46454e1
cambio
jbalcerol
committed
f005bf0
Merge branch 'dev' of https://github.com/OmarVasquez/caption-this-dian1 into dev
jonathanlr87
committed
1d18d7d
Merge branch 'dev' of https://github.com/OmarVasquez/caption-this-dian1 into dev
jbalcerol
committed
b41077c
Merge branch 'dev' of https://github.com/OmarVasquez/caption-this-dian1 into dev
CarlosPor
committed
d36b282
Ajuste
eggp73
committed
06bfc01
Merge branch 'dev' of https://github.com/OmarVasquez/caption-this-dian1 into dev
jbalcerol
committed
6fd8cf7
M
LuisGustavoTamayoM
committed
e0210dc
Merge branch 'dev' of https://github.com/OmarVasquez/caption-this-dian1 into dev
LuisGustavoTamayoM
committed
7b9d735
Merge branch 'dev' of https://github.com/OmarVasquez/caption-this-dian1 into dev
lidaarciniegasr
committed
f0dd0db
subir último
apereap2017
committed
6ccc046
Merge branches 'dev' and 'dev' of https://github.com/OmarVasquez/caption-this-dian1 into dev
afarenasde
committed
1bd35e0
Merge branch 'dev' of https://github.com/OmarVasquez/caption-this-dian1 into dev
CarlosPor
committed
2da4999
solucion
Rafanix7
committed
0df30e5
Merge branch 'dev' of https://github.com/Omarvasquez/caption-this-dian1 into dev
Rafanix7
committed
9cdc1c6
Merge branch 'dev' of https://github.com/OmarVasquez/caption-this-dian1 into dev
apereap2017
committed
4aa2f89
Merge branch 'dev' of https://github.com/Omarvasquez/caption-this-dian1 into dev
Rafanix7
committed
8905da3
Merge branch 'dev' of https://github.com/OmarVasquez/caption-this-dian1 into dev
CarlosPor
committed
f36c03b
suibir2
apereap2017
committed
fa20c6d
Merge branch 'dev' of https://github.com/OmarVasquez/caption-this-dian1 into dev
apereap2017
committed
6f2ba86
update resolve c
JCgmv
committed
c21a5d7
facilitador
jbalcerol
committed
8fe03c7
Merge branch 'dev' of https://github.com/OmarVasquez/caption-this-dian1 into dev
JCgmv
committed
f7d123b
Merge branch 'dev' of https://github.com/OmarVasquez/caption-this-dian1 into dev
CarlosPor
committed
6bf756e
subir2
apereap2017
committed
226a008
Merge branch 'dev' of https://github.com/OmarVasquez/caption-this-dian1 into dev
apereap2017
committed
f096006
Merge branch 'dev' of https://github.com/OmarVasquez/caption-this-dian1 into dev
jbalcerol
committed
d344102
Merge branch 'dev' of https://github.com/OmarVasquez/caption-this-dian1 into dev
jbalcerol
committed
e318083
remueve colaborador
karlosegura
committed
c106843
Nuevo
LuisGustavoTamayoM
committed
3d95e9c
Merge branch 'dev' of https://github.com/OmarVasquez/caption-this-dian1 into dev
CarlosPor
committed
4f0168e
subir2
apereap2017
committed
c48f5ae
Merge branch 'dev' of https://github.com/OmarVasquez/caption-this-dian1 into dev
karlosegura
committed
62a93e8
Merge branch 'dev' of https://github.com/OmarVasquez/caption-this-dian1 into dev
apereap2017
committed
798f847
Merge branch 'dev' of https://github.com/OmarVasquez/caption-this-dian1 into dev
MarciarellY71
committed
2e1cd98
Merge branch 'dev' of https://github.com/OmarVasquez/caption-this-dian1 into dev
afarenasde
committed
126b99c
Merge branch 'dev' of https://github.com/OmarVasquez/caption-this-dian1 into dev
LuisGustavoTamayoM
committed
c978ff9
Merge branch 'dev' of https://github.com/OmarVasquez/caption-this-dian1 into dev
CarlosPor
committed
cc84df9
Merge branch 'dev' of https://github.com/OmarVasquez/caption-this-dian1 into dev
MarciarellY71
committed
6eb310d
Merge branch 'dev' of https://github.com/OmarVasquez/caption-this-dian1 into dev
afarenasde
committed
06c86ea
Nombre
jbalcerol
committed
c7d7523
Merge branch 'dev' of https://github.com/OmarVasquez/caption-this-dian1 into dev
LuisGustavoTamayoM
committed
7939a67
Merge branch 'dev' of https://github.com/OmarVasquez/caption-this-dian1 into dev
jorgeduardo61
committed
473caf0
Merge branch 'dev' of https://github.com/OmarVasquez/caption-this-dian1 into dev
MarciarellY71
committed
2a6bdd9
Merge branch 'dev' of https://github.com/OmarVasquez/caption-this-dian1 into dev
jbalcerol
committed
9828c58
Ajuste
eggp73
committed
7db2499
Merge branch 'dev' of https://github.com/OmarVasquez/caption-this-dian1 into dev
jorgeduardo61
committed
65adbb6
Merge branch 'dev' of https://github.com/OmarVasquez/caption-this-dian1 into dev
LuisGustavoTamayoM
committed
e9d03ab
Merge branch 'dev' of https://github.com/OmarVasquez/caption-this-dian1 into dev
MarciarellY71
committed
703ecf8
Merge branch 'dev' of https://github.com/OmarVasquez/caption-this-dian1 into dev
jorgeduardo61
committed
265bf0e
otra vez
jonathanlr87
committed
a90c3c7
Merge branch 'dev' of https://github.com/OmarVasquez/caption-this-dian1 into dev
lidaarciniegasr
committed
b483b12
Merge branch 'dev' of https://github.com/OmarVasquez/caption-this-dian1 into dev
jonathanlr87
committed
b27241d
Merge branch 'dev' of https://github.com/OmarVasquez/caption-this-dian1 into dev
lidaarciniegasr
committed
ec8f0ef
Merge branch 'dev' of https://github.com/OmarVasquez/caption-this-dian1 into dev
MarciarellY71
committed
2bfc10c
Merge branch 'dev' of https://github.com/OmarVasquez/caption-this-dian1 into dev
lidaarciniegasr
committed
b2c1fa9
Merge branch 'dev' of http://github.com/Omarvasquez/caption-this-dian1 into dev
eggp73
committed
f646b9f
Cambios nuevos
afarenasde
committed
658eaab
Merge branch 'dev' of http://github.com/Omarvasquez/caption-this-dian1 into dev
eggp73
committed
ae697f6
Merge branch 'dev' of https://github.com/OmarVasquez/caption-this-dian1 into dev
afarenasde
committed
b2c9962
Prueba 2 jc
jairocollante
committed
8a208bf
Merge branch 'dev' of https://github.com/OmarVasquez/caption-this-dian1 into dev
afarenasde
committed
8764afc
otra 4
jonathanlr87
committed
665ad92
Ajuste
eggp73
committed
f0a41cf
CAMBIO
jorgeduardo61
committed
5ba9c5b
Merge branch 'dev' of https://github.com/OmarVasquez/caption-this-dian1 into dev
MarciarellY71
committed
46ffbbf
NN
LuisGustavoTamayoM
committed
ee14cf1
nuevo cambio
rcorredorg1
committed
44fc868
Merge branch 'dev' of https://github.com/OmarVasquez/caption-this-dian1 into dev
LuisGustavoTamayoM
committed
3207975
Merge branch 'dev' of https://github.com/OmarVasquez/caption-this-dian1 into dev
MarciarellY71
committed
fce87e3
Merge branch 'dev' of https://github.com/OmarVasquez/caption-this-dian1 into dev
jairocollante
committed
7e67da4
Merge branch 'dev' of https://github.com/OmarVasquez/caption-this-dian1 into dev
MarciarellY71
committed
00fee61
Merge branch 'dev' of https://github.com/OmarVasquez/caption-this-dian1 into dev
jonathanlr87
committed
e95aac0
Merge branch 'dev' of https://github.com/OmarVasquez/caption-this-dian1 into dev
jonathanlr87
committed
5c0368b
Merge branch 'dev' of https://github.com/OmarVasquez/caption-this-dian1 into dev
jorgeduardo61
committed
4bb7b60
Merge branch 'dev' of https://github.com/OmarVasquez/caption-this-dian1 into dev
jairocollante
committed
a6dc134
Merge branch 'dev' of https://github.com/OmarVasquez/caption-this-dian1 into dev
jairocollante
committed
92029c0
Merge branch 'dev' of https://github.com/OmarVasquez/caption-this-dian1 into dev
jorgeduardo61
committed
4714756
Merge branch 'dev' of https://github.com/OmarVasquez/caption-this-dian1 into dev
jorgeduardo61
committed
9ecb97d
Merge branch 'dev' into devovasquez
OmarVasquez
committed
980a29b
Merge pull request #29 from OmarVasquez/devovasquez
OmarVasquez
authored
8e74e6a
sube
apereap2017
committed
4458bfc
Merge branch 'dev' of https://github.com/OmarVasquez/caption-this-dian1 into dev
apereap2017
committed
e45d580
Merge branch 'dev' of http://github.com/Omarvasquez/caption-this-dian1 into dev
eggp73
committed
b397f9e
Merge branch 'dev' of https://github.com/OmarVasquez/caption-this-dian1 into dev
rcorredorg1
committed
57cd6a3
Merge branch 'dev' of https://github.com/OmarVasquez/caption-this-dian1 into dev
rcorredorg1
committed
00b28cf
Merge branch 'dev' of http://github.com/Omarvasquez/caption-this-dian1 into dev
eggp73
committed
70c3b2a
Merge branch 'dev' of http://github.com/Omarvasquez/caption-this-dian1 into dev
eggp73
committed
f3347de
Merge branch 'dev' into prozoc
pedrorozoc
committed
53740c0
Cambios dev
davidVel321
committed
244c64f
Merge branch 'dev' into jcortesl
jcortesl
committed
6a4c876
Merge pull request #31 from OmarVasquez/prozoc
pedrorozoc
authored
9b89b69
Merge pull request #32 from OmarVasquez/DevDavid
davidVel321
authored
994c86b
Merge pull request #37 from OmarVasquez/GustavoT
LuisGustavoTamayoM
authored
1e04989
mensaje
jcortesl
committed
0d0291b
Merge pull request #35 from OmarVasquez/jcortesl
jcortesl
authored
4d1a562
comentario commit
jorgeduardo61
committed
f66a93c