]> git.openstreetmap.org Git - osqa.git/commit
merging notification-config -> trunk, changes from revision 695, 696, 697, 698, 699...
authorjordan <jordan@0cfe37f9-358a-4d5e-be75-b63607b5c754>
Tue, 15 Mar 2011 23:50:48 +0000 (23:50 +0000)
committerjordan <jordan@0cfe37f9-358a-4d5e-be75-b63607b5c754>
Tue, 15 Mar 2011 23:50:48 +0000 (23:50 +0000)
commitc6fe5ef7d8e2c42066e0f096d4d1c90a356c5b94
treed88e2fdf699e16c61ff110a2390076ee7eecb113
parent00707e107d63126a511257f2953e87b7e9d784b7
merging notification-config -> trunk, changes from revision 695, 696, 697, 698, 699, 702

git-svn-id: http://svn.osqa.net/svnroot/osqa/trunk@846 0cfe37f9-358a-4d5e-be75-b63607b5c754
forum/skins/default/templates/auth/complete.html
forum/skins/default/templates/users/subscriptions_settings.html
forum/templatetags/email_tags.py