Rsantiagogbr - #69

Open

rsangar25 wants to merge 265 commits into

githubtraining:mainfrom

OmarVasquez:rsantiagogbr

This pull request is big! We're only showing the most recent 250 commits

Commits on May 7, 2024

Merge branch 'branchRene' into DevDavid
jbalcerol
authored
ef83a2e
Merge pull request #16 from OmarVasquez/JhonF
JCgmv
authored
dbb617d
Merge pull request #22 from OmarVasquez/cseguraf
karlosegura
authored
664f133
Merge branch 'jcollanter' into mcerinzav
MarciarellY71
authored
925a4c5
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
Merge pull request #8 from OmarVasquez/mcerinzav
MarciarellY71
authored
543a771
Merge pull request #15 from OmarVasquez/CarlosPor
CarlosPor
authored
9d467bc
NUEVO CAMBIO
davidVel321
committed
48b00d2
Merge pull request #3 from OmarVasquez/DevDavid
jcortesl
authored
c0e0f86
Archivo para validacion conflicto
JCgmv
committed
004cbf6
Merge pull request #24 from OmarVasquez/mcerinzav
lidaarciniegasr
authored
8aff326
Merge pull request #12 from OmarVasquez/gpinzond.07may2024
gpinzond
authored
625029d
Cambio Z
davidVel321
committed
543e020
Modificacion README ovasquez
OmarVasquez
committed
fdf6981
Prueba VScode
jbalcerol
committed
6b38a09
Cambios v2
OmarVasquez
committed
ad448df
cambios v2
pedrorozoc
committed
2fdd2c4
Cambios v3
OmarVasquez
committed
b7b3330
PRUEBA 1 AFA
afarenasde
committed
6177de4
cambio vscode
davidVel321
committed
6cf1899
Cambio VScode
jbalcerol
committed
466b971
Archivo para validacion conflicto
JCgmv
committed
29561ab
Merge branch 'JhonF' of https://github.com/OmarVasquez/caption-this-dian1 into JhonF
JCgmv
committed
2d13fe4
Ultimo cambio 02:05 pm
jbalcerol
committed
985e84c
CAMBIO LABORATORIO 2
lidaarciniegasr
committed
7f46613
CAMBIO INDEX LABORATORIO 2
lidaarciniegasr
committed
4803175
Agrega URL DIAN
jbalcerol
committed
4e04b96
Ejercicio 2
jairocollante
committed
6d868e2
agrega www
jbalcerol
committed
61cd58b
mensaje de commit prueba V!
JCgmv
committed
aeb3ff1
Cambio 02:21 pm
jbalcerol
committed
e628d74
Resalta
jbalcerol
committed
69c08e6
VSTUDIO
jcortesl
committed
4f4e79d
Comit hecho
LuisGustavoTamayoM
committed
675f1f0
Modificacion hoy
Rafanix7
committed
4b8d8b7
Version2 modificacion de prueba
JCgmv
committed
96c69ae
cambio edison
jcortesl
committed
87fb329
resolucion de conflictos
LuisGustavoTamayoM
committed
6d88169
Cambios
jbalcerol
committed
a34e67a
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
salto
jbalcerol
committed
59c7b47
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
cambio 1.2
gpinzond
committed
7256c45
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
gpinzond
committed
2e2f639
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
gpinzond
committed
181e8cd
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 remote-tracking branch 'origin/dev' into branchRene
jbalcerol
committed
ee286db
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' into jcollanter
jairocollante
committed
88373f9
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 branch 'dev' into larciniegasr
lidaarciniegasr
committed
12eb174
Merge pull request #37 from OmarVasquez/GustavoT
LuisGustavoTamayoM
authored
1e04989
mensaje
jcortesl
committed
0d0291b
Merge pull request #35 from OmarVasquez/jcortesl
jcortesl
authored
4d1a562
Merge branch 'dev' into branchRene
jbalcerol
committed
3ce5c86
Merge remote-tracking branch 'origin/dev' into branchRene
jbalcerol
committed
29a6401
c1
gpinzond
committed
bf03525
Merge branch 'dev' of https://github.com/OmarVasquez/caption-this-dian1 into dev
gpinzond
committed
8930eb9
Merge remote-tracking branch 'origin/Bnx' into GustavoT
LuisGustavoTamayoM
committed
b34f3d5
Merge pull request #30 from OmarVasquez/branchRene
jbalcerol
authored
bcbe44e
Merge branch 'dev' into GustavoT
LuisGustavoTamayoM
committed
d9945c0
Merge branch 'dev' into jcollanter
jairocollante
authored
f2ac0d1
Merge pull request #38 from OmarVasquez/jcollanter
jairocollante
authored
37d7a87
Merge pull request #42 from OmarVasquez/GustavoT
LuisGustavoTamayoM
authored
1e965e2
Merge branch 'dev' into JhonF
JCgmv
committed
a996143
Merge pull request #36 from OmarVasquez/JhonF
JCgmv
authored
8ec7b35
Merge branch 'dev' into larciniegasr
lidaarciniegasr
authored
45fe69b
Merge pull request #45 from OmarVasquez/larciniegasr
lidaarciniegasr
authored
297c449
Update README.md
Alejo1967
authored
6fb0157
Update README.md
Alejo1967
authored
1719359
Merge remote-tracking branch 'origin/dev' into rsantiagogbr
rsangar25
committed
ee0e903