diff options
| -rw-r--r-- | AUTHORS | 3 |
1 files changed, 0 insertions, 3 deletions
@@ -198,11 +198,8 @@ answer newbie questions, and generally made Django that much better: Waylan Limberg <waylan@gmail.com> limodou Philip Lindborg <philip.lindborg@gmail.com> -<<<<<<< .working Simon Litchfield <simon@quo.com.au> -======= msaelices <msaelices@gmail.com> ->>>>>>> .merge-right.r6370 Matt McClanahan <http://mmcc.cx/> Martin Maney <http://www.chipy.org/Martin_Maney> Petr Marhoun <petr.marhoun@gmail.com> |