]> git.mxchange.org Git - friendica.git/commit
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
authorSimon L'nu <simon.lnu@gmail.com>
Wed, 28 Mar 2012 10:48:05 +0000 (06:48 -0400)
committerSimon L'nu <simon.lnu@gmail.com>
Wed, 28 Mar 2012 10:48:05 +0000 (06:48 -0400)
commit57ef21295ab725361950b53aaa9f502d99bbfa47
treee5a5673a9dac18ee2476c8bb9c4f3b2b0788088a
parent4a75ea2f42c44318fa018a0753c54e0a7ce42188
parent77aeba0d127857b0243c57bbac59b687cabb1dca
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'

* remotes/upstream/master:
  viewsrc: return only body if page is requested via ajax

* master: