~ris/loco-team-portal/fix-552762
Viewing all changes in revision 555.
-
Committer:
Robert Sajdok
-
Date:
2013-02-07 11:10:29 UTC
-
mfrom:
(552.1.48 trunk)
-
Revision ID:
robert.sajdok@gmail.com-20130207111029-mh8me9ipbnm7105n
Resolve conflicts
-
loco_directory/locale/fo/LC_MESSAGES
-
loco_directory/locale/ug/LC_MESSAGES
-
loco_directory/media/fonts
-
loco_directory/templates/articles
-
loco_directory/templates/feeds
-
loco_directory/templates/profiles
expand all
collapse all
Show diffs side-by-side
added
removed