]> git.parisson.com Git - teleforma.git/commitdiff
projects / teleforma.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 21df31a c6d4f08)
Merge branch 'dev' into feature/next feature/next
authorGuillaume Pellerin <guillaume.pellerin@ircam.fr>
Tue, 7 Jul 2020 10:34:47 +0000 (12:34 +0200)
committerGuillaume Pellerin <guillaume.pellerin@ircam.fr>
Tue, 7 Jul 2020 10:34:47 +0000 (12:34 +0200)
1  2 
docker-compose.yml patch | diff1 | diff2 | blob | history
requirements.txt patch | diff1 | diff2 | blob | history

diff --cc docker-compose.yml
Simple merge
diff --cc requirements.txt
Simple merge
Unnamed repository; edit this file 'description' to name the repository.