]> git.mxchange.org Git - friendica.git/commit
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
authorSimon L'nu <simon.lnu@gmail.com>
Sat, 3 Mar 2012 14:45:32 +0000 (09:45 -0500)
committerSimon L'nu <simon.lnu@gmail.com>
Sat, 3 Mar 2012 14:45:32 +0000 (09:45 -0500)
commit2b9ea33e8b2f774d7c4da5175e167470f1070282
tree6e2a75c990870483327d420cefad9304db1d59e9
parentba284044707e0f66fed98c711b9262bd623a0d42
parent792031c36e81c3ab6cad8bb132a1db90974918a1
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'

* remotes/upstream/master:
  fix editor

* master: