Robin Ward 67f0de4b8b Fixed some merge conflicts

2013-03-15 16:59:10 -04:00

..

assets

Fixed some merge conflicts

2013-03-15 16:59:10 -04:00

controllers

Merge pull request #462 from kubabrecka/colorpicker3

2013-03-15 13:43:59 -07:00

helpers

FIX: Twitter tags were using property instead of name.

2013-03-15 15:42:21 -04:00

mailers

2nd try: localize date formats on server side

2013-03-12 19:30:56 +01:00

models

Big commit:

2013-03-15 14:35:33 -04:00

serializers

Merge pull request #462 from kubabrecka/colorpicker3

2013-03-15 13:43:59 -07:00

views

Fix #435 increased the lenghth of category.topic_prefix string; also added zh_TW translations by converting the Simplified Chinese to Traditional Chinese

2013-03-14 18:18:59 +08:00