Download as
Browse Code »

Commit 07871900d0e549147a7db6a6f248159819183f6f

Authored by Antonio Terceiro
1 parent 8f6c1f44
Exists in master and in 29 other branches add_member_task_reject_details, admin_visible_profile, article-list-template, community_notifications, contact_admin_translation, event_fixes, fix_comments_pagination, fix_rails4_organization_ratings, fix_sign_up_form, follow_step_fix, forum_topic_creation, mirror_block_improvements, multi_env_on_remote_user, new_security, noosfero_spb_ci, organization_ratings_improvements, organization_ratings_link_to_profile_stable-spb-1.3, organization_ratings_translations_fix, profile_api_improvements, ratings_minor_fixes, remote_user_fix, send_email_to_admins, stable-spb-1.3, stable-spb-1.3-fixes, stable-spb-1.4, stable-spb-1.5, suggest_rejected_value, web_steps_improvements, xss_terminate_custom_options

Updating auto-generated files 

Also added another alias for Aurelio in .mailmap
Showing 3 changed files with 3 additions and 1 deletions   Show diff stats
.mailmap
  Diff comments   View file @0787190
1 1 Antonio Terceiro <terceiro@colivre.coop.br> <AntonioTerceiro@3f533792-8f58-4932-b0fe-aaf55b0a4547>
2 2 Antonio Terceiro <terceiro@colivre.coop.br> <terceiro@softwarelivre.org>
3 3 Aurelio A. Heckert <aurelio@colivre.coop.br> <AurelioAHeckert@3f533792-8f58-4932-b0fe-aaf55b0a4547>
  4 +Aurelio A. Heckert <aurelio@colivre.coop.br> <aurium@gmail.com>
4 5 Daniela Soares Feitosa <danielafeitosa@colivre.coop.br> <DanielaFeitosa@3f533792-8f58-4932-b0fe-aaf55b0a4547>
5 6 Daniela Soares Feitosa <danielafeitosa@colivre.coop.br> <danielafeitosa@colivre.coop.br>
6 7 Daniela Soares Feitosa <danielafeitosa@colivre.coop.br> <daniela@sede.colivre.coop.br>
... ...
AUTHORS
  Diff comments   View file @0787190
... ... @@ -9,6 +9,7 @@ Developers
9 9 Antonio Terceiro <terceiro@colivre.coop.br>
10 10 Aurelio A. Heckert <aurelio@colivre.coop.br>
11 11 Daniela Soares Feitosa <danielafeitosa@colivre.coop.br>
  12 +Daniel Cunha <daniel.ccunha@gmail.com>
12 13 Fernanda Lopes <nanda.listas+psl@gmail.com>
13 14 Grazieno Pellegrino <grazieno@gmail.com>
14 15 Italo Valcy <italo@dcc.ufba.br>
... ...
public/503.html
  Diff comments   View file @0787190
... ... @@ -22,7 +22,7 @@
22 22 <div id='de' style='display: none' class='message'>
23 23 <h1>Systempflege</h1>
24 24 <p>
25   - This system is under maintainance. It should be back in a few moments.
  25 + Das System wird gerade gepflegt. Es wird in wenigen Momenten wieder verfügbar sein.
26 26 </p>
27 27 </div>
28 28  
... ...