diff options
| author | G.B <greta.brev@outlook.com> | 2015-03-22 22:40:57 +0100 |
|---|---|---|
| committer | G.B <greta.brev@outlook.com> | 2015-03-22 22:40:57 +0100 |
| commit | 58e7533af4c77817c592f7ba36578b72dca12b2b (patch) | |
| tree | 379943d3b10cfd2743260ba9d7f324cab0ac4998 /about.html | |
| parent | 7130549c718667ae9325a498a9e0c9a84ff66e6b (diff) | |
| parent | 44e6a0d0a98fbe70a3eab7d7218525c5c1e0b142 (diff) | |
| download | www-58e7533af4c77817c592f7ba36578b72dca12b2b.tar.gz www-58e7533af4c77817c592f7ba36578b72dca12b2b.tar.bz2 www-58e7533af4c77817c592f7ba36578b72dca12b2b.zip | |
final
Former-commit-id: 3081363f2e37546750381f773c0b1e39a9418834
Diffstat (limited to 'about.html')
| -rw-r--r-- | about.html | 9 |
1 files changed, 9 insertions, 0 deletions
@@ -83,10 +83,19 @@ <p lang="it">Realizzando pensieri profondi</p> </div> <div class="col-lg-4"> +<<<<<<< HEAD <h2>Greta Breveglieri & Ylenia Baldanza</h2> <p lang="en">Translators and best fan ever</p> <p lang="it">Traduttrici e migliori fan mai avute</p> </div> +======= + <h2>Greta Breveglieri & Ylenia Baldanza</h2> + <p lang="en">Translators</p> + <p lang="de">Übersetzer</p> + <p lang="fr">Traductrice</p> + <p lang="it">Traduttrici</p> + </div> +>>>>>>> 70538e29b9e8925da767e258f707b6e90c368521 </div> <!--# include file="common/footer.inc" --> |