aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' of git://github.com/tobiasd/friendikaroot2011-01-211-1/+1
|\
| * variable name spelling mistake in template correctedTobias Diekershoff2011-01-211-1/+1
| * Merge branch 'master' of git://github.com/friendika/friendikaTobias Diekershoff2011-01-212-5/+9
| |\
* | \ Merge branch 'master' of git://github.com/friendika/friendikaroot2011-01-212-5/+9
|\ \ \ | | |/ | |/|
| * | don't urlencode $_GET varsFriendika2011-01-212-5/+9
* | | Merge branch 'master' of git://github.com/tobiasd/friendikaroot2011-01-212-22/+22
|\ \ \ | | |/ | |/|
| * | more stringsTobias Diekershoff2011-01-212-21/+21
| * | spelling ;-)Tobias Diekershoff2011-01-211-1/+1
* | | Merge branch 'master' of git://github.com/tobiasd/friendikaroot2011-01-212-2/+2
|\| |
| * | minor wordeningTobias Diekershoff2011-01-211-1/+1
| * | minor wording correctionTobias Diekershoff2011-01-211-1/+1
* | | Merge branch 'master' of git://github.com/tobiasd/friendikaroot2011-01-213-32/+32
|\| |
| * | minor correction to profile_edit.tpl more stringsTobias Diekershoff2011-01-212-31/+31
| * | made this notification header consisten with the otherTobias Diekershoff2011-01-211-1/+1
* | | Merge branch 'master' of git://github.com/tobiasd/friendikaroot2011-01-211-2/+2
|\| |
| * | minor thing with the stringsTobias Diekershoff2011-01-211-2/+2
* | | Merge branch 'master' of git://github.com/tobiasd/friendikaroot2011-01-211-0/+3
|\| |
| * | german translation of registrations-top.tplTobias Diekershoff2011-01-211-0/+3
* | | Merge branch 'master' of git://github.com/tobiasd/friendikaroot2011-01-211-23/+23
|\| |
| * | some more stringsTobias Diekershoff2011-01-211-23/+23
* | | Merge branch 'master' of git://github.com/tobiasd/friendikaroot2011-01-2149-0/+2867
|\| |
| * | german translation of install_db.tplTobias Diekershoff2011-01-211-6/+6
| * | german translation of jot.tplTobias Diekershoff2011-01-211-7/+7
| * | german translation of lostpass.tpl and lostpass_eml.tplTobias Diekershoff2011-01-212-18/+18
| * | german translation of netfriend.tplTobias Diekershoff2011-01-211-3/+3
| * | german translation of passchanged_eml.tpl pagetypes.tplTobias Diekershoff2011-01-212-19/+19
| * | german translation of the profile* filesTobias Diekershoff2011-01-218-20/+20
| * | german translation of pwdreset.tplTobias Diekershoff2011-01-211-5/+5
| * | german translation of register-link.tplTobias Diekershoff2011-01-211-1/+1
| * | german translation of register_open_eml.tplTobias Diekershoff2011-01-212-18/+15
| * | german translation of register_verify_eml.tplTobias Diekershoff2011-01-211-14/+9
| * | german translation of request_notify_eml.tplTobias Diekershoff2011-01-211-10/+7
| * | german translation of wallwall_item.tplTobias Diekershoff2011-01-211-3/+3
| * | Merge branch 'master' of git://github.com/friendika/friendikaTobias Diekershoff2011-01-216-35/+59
| |\|
| * | german translation of settings_nick_set.tplTobias Diekershoff2011-01-201-1/+1
| * | german translation of settings_nick_subdir.tplTobias Diekershoff2011-01-201-4/+7
| * | german translation of settings_nick_unset.tplTobias Diekershoff2011-01-201-5/+7
| * | german translation of wall_item_drop.tplTobias Diekershoff2011-01-201-1/+3
| * | german translation of settings.tplTobias Diekershoff2011-01-201-24/+24
| * | german translation of wall_received_eml.tplTobias Diekershoff2011-01-201-5/+5
| * | Merge branch 'master' of git://github.com/friendika/friendikaTobias Diekershoff2011-01-2010-31/+173
| |\ \
| * | | german translation mail_received_eml.tplTobias Diekershoff2011-01-191-5/+6
| * | | german translation of like.tplTobias Diekershoff2011-01-191-3/+3
| * | | german translation of jot-header.tplTobias Diekershoff2011-01-191-3/+3
| * | | german translations of insecure_net.tpl intro_complete_eml.tpl andTobias Diekershoff2011-01-193-20/+18
| * | | german translation of friend_complete_eml.tplTobias Diekershoff2011-01-191-12/+12
| * | | german translation of group_new.tplTobias Diekershoff2011-01-191-3/+3
| * | | german translation of view/dev/group_edit.tplTobias Diekershoff2011-01-191-3/+3
| * | | addedTobias Diekershoff2011-01-191-0/+7
| * | | Merge branch 'master' of git://github.com/friendika/friendikaTobias Diekershoff2011-01-1913-11/+67
| |\ \ \