← Back to team overview

team4alfanous team mailing list archive

[Branch ~team4alfanous/alfanous/alfanous-git] Rev 412: Merge branch 'master' of github.com:Alfanous-team/alfanous

 

Merge authors:
  Assem Chelli (عاصم شلي) (assem-ch)
  zakaria (zakaria08esi)
------------------------------------------------------------
revno: 412 [merge]
committer: Assem Chelli <assem.ch@xxxxxxxxx>
timestamp: Sat 2012-11-03 18:03:44 +0100
message:
  Merge branch 'master' of github.com:Alfanous-team/alfanous
modified:
  AUTHORS.rst


--
lp:alfanous
https://code.launchpad.net/~team4alfanous/alfanous/alfanous-git

Your team Alfanous team is subscribed to branch lp:alfanous.
To unsubscribe from this branch go to https://code.launchpad.net/~team4alfanous/alfanous/alfanous-git/+edit-subscription
=== modified file 'AUTHORS.rst'
--- AUTHORS.rst	2012-10-11 01:27:06 +0000
+++ AUTHORS.rst	2012-11-03 09:19:25 +0000
@@ -12,7 +12,7 @@
 ------------------ -------------------------- --------------------------------- ---------------------------------------------
 `Assem Chelli`_     Project Manager/Developer   assem.ch [at] gmail.com          `@assem_ch`_
 `Abdellah Chelli`_  Web Developer               sneetsher [at] gmail.com         `@sneetsher`_ 
-`Zaki Smahi`_       Developer                   zakaria08esi [at] gmail.com      `@zsmahi`_  
+`Zakaria Smahi`_       Developer                   zakaria08esi [at] gmail.com      `@zsmahi`_  
 `Walid Ziouche`_    Tester                      01walid [at] gmail.com           `@01walid`_  
 `Muslih al aqaad`_  Graphic Designer            muslihzarth [at] gmail.com       `@muslihzarth`_
 Yasmine Hoadjli     Community Manager           yhoadjli [at] gmail.com          `@yasmamine`_ 
@@ -20,7 +20,7 @@
 
 .. _`Assem Chelli`: https://github.com/assem-ch
 .. _`Abdellah Chelli`: https://github.com/sneetsher 
-.. _`Zaki Smahi`: https://github.com/zsmahi
+.. _`Zakaria Smahi`: https://github.com/zsmahi
 .. _`Mouad Debbar` : https://github.com/mdebbar
 .. _`Walid Ziouche`: https://github.com/01walid
 .. _`Muslih al aqaad`: https://github.com/muslih