]> git.mxchange.org Git - friendica.git/commit
merge
authorfriendica <info@friendica.com>
Sat, 2 Mar 2013 23:46:54 +0000 (15:46 -0800)
committerfriendica <info@friendica.com>
Sat, 2 Mar 2013 23:46:54 +0000 (15:46 -0800)
commitf07df4f667c42866b2ea7e65ad1356cdd5b394f5
tree5c2f6e595a4be3cae33ed9b2f68d69776b9083f5
parent59c03edbc93265d57646ccd033171ab17148378a
merge
45 files changed:
include/bbcode.php
include/pgettext.php
index.php
mod/admin.php
mod/apps.php
mods/sample-Lighttpd.config [new file with mode: 0644]
util/messages.po
util/po2php.php
util/run_xgettext.sh
view/admin_site.tpl
view/ca/strings.php
view/cs/strings.php
view/de/messages.po
view/de/strings.php
view/eo/strings.php
view/es/strings.php
view/fr/strings.php
view/is/strings.php
view/it/messages.po
view/it/strings.php
view/nb-no/strings.php
view/pl/messages.po
view/pl/strings.php
view/pt-br/strings.php
view/ru/strings.php
view/smarty3/admin_site.tpl
view/smarty3/admin_users.tpl
view/theme/decaf-mobile/admin_users.tpl
view/theme/decaf-mobile/smarty3/admin_users.tpl
view/theme/diabook/admin_users.tpl
view/theme/diabook/smarty3/admin_users.tpl
view/theme/frost-mobile/admin_users.tpl
view/theme/frost-mobile/smarty3/admin_users.tpl
view/theme/frost/admin_users.tpl
view/theme/frost/smarty3/admin_users.tpl
view/theme/smoothly/images/larrow.gif [new file with mode: 0644]
view/theme/smoothly/images/rarrow.gif [new file with mode: 0644]
view/theme/smoothly/login.tpl
view/theme/smoothly/smarty3/login.tpl
view/theme/smoothly/smarty3/wall_thread.tpl
view/theme/smoothly/style.css
view/theme/smoothly/theme.php
view/theme/smoothly/wall_thread.tpl
view/zh-cn/messages.po
view/zh-cn/strings.php