Skip to content

Commit

Permalink
Merge branch 'dev' of https://github.com/GandalFran/TwiCo into dev
Browse files Browse the repository at this point in the history
  • Loading branch information
luisblazquezm committed Dec 16, 2020
2 parents e32e89e + 055fa7a commit 415468e
Showing 1 changed file with 7 additions and 4 deletions.
11 changes: 7 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,10 @@ Twico, is the final project for the SOA subject of the Computer Science Master's
<img src="https://github.com/GandalFran/soa-final/blob/master/soa-web-app/vue-web/public/img/dashboard.PNG" align="center">

## Authors
- Luis Blazquez Miñambres (@luisblazquezm)
- Miguel Cabezas Puerto (@MiguelCabezasPuerto)
- Óscar Sánchez Juanes (@oscarsanchezj)
- Francisco Pinto-Santos (@gandalfran)
<table>
<tr>
<td align="center"><a href="https://github.com/GandalFran"><img src="https://avatars2.githubusercontent.com/u/29973536?s=460&u=b45b09f015e310153cd146b8903443c9d0080494&v=4" width="100px;" alt=""/><br /><sub><b>Francisco Pinto Santos</b></sub></a><br /><a href="https://github.com/GandalFran?tab=repositories" title="Code">💻</a> <a href="https://github.com/all-contributors/all-contributors/commits?author=GandalFran" title="Documentation">📖</a> <a href="https://github.com/GandalFran/Twico/commits?author=GandalFran" title="Front-end">🎨</a> <a href="https://github.com/GandalFran/Twico/commits?author=GandalFran" title="Back-end">⛏</a> <a href="https://github.com/GandalFran" title="Ideas, Planning, & Feedback">🤔</a></td>
<td align="center"><a href="https://github.com/luisblazquezm"><img src="https://avatars0.githubusercontent.com/u/40697133?s=460&u=82f3e7d01e88b27ea481e57791fa62c9d519d2ac&v=4" width="100px;" alt=""/><br /><sub><b>Luis Blázquez Miñambres</b></sub></a><br /><a href="https://github.com/luisblazquezm?tab=repositories" title="Code">💻</a> <a href="https://github.com/GandalFran/Twico/commits?author=luisblazquezm" title="Documentation">📖</a> <a href="https://github.com/GandalFran/Twico/commits?author=luisblazquezm" title="Back-end">⛏</a> <a href="https://github.com/GandalFran/Twico/commits?author=luisblazquezm" title="IA">🧠</a> <a href="https://github.com/luisblazquezm" title="Ideas, Planning, & Feedback">🤔</a></td>
<td align="center"><a href="https://github.com/MiguelCabezasPuerto"><img src="https://avatars2.githubusercontent.com/u/47638681?s=460&v=4" width="100px;" alt=""/><br /><sub><b>Miguel Cabezas Puerto</b></sub></a><br /> <a href="https://github.com/MiguelCabezasPuerto?tab=repositories" title="Code">💻</a> <a href="https://github.com/GandalFran/Twico/commits?author=MiguelCabezasPuerto" title="Documentation">📖</a> <a href="https://github.com/GandalFran/Twico/commits?author=MiguelCabezasPuerto" title="Back-end">⛏</a> <a href="https://github.com/MiguelCabezasPuerto" title="Ideas, Planning, & Feedback">🤔</a></td>
<td align="center"><a href="https://github.com/oscarsanchezj"><img src="https://avatars3.githubusercontent.com/u/48065910?s=460&u=c8287b792cf94981253c644207661e75fbda96c2&v=4" width="100px;" alt=""/><br /><sub><b>Oscar Sánchez Juanes</b></sub></a><br /> <a href="https://github.com/oscarsanchezj?tab=repositories" title="Code">💻</a> <a href="https://github.com/GandalFran/Twico/commits?author=oscarsanchezj" title="Documentation">📖</a> <a href="https://github.com/GandalFran/Twico/commits?author=oscarsanchezj" title="Back-end">⛏</a> <a href="https://github.com/oscarsanchezj" title="Ideas, Planning, & Feedback">🤔</a></td>
</tr>

0 comments on commit 415468e

Please sign in to comment.