git.mxchange.org Git - friendica.git/commit

Merge remote-tracking branch 'remotes/upstream/master'

* remotes/upstream/master:
  Fixed syntax error in usage of anonymous function.
  rev update
  quattro: add id to items container div needed to make commit 4c6a4321 work
  update head.tpl for dispy
  rev update
  use regular theme choosing logic if no mobile theme is specified
  Removed useless function
  disable tos and privacy links
  disable tos and privacy links
  Rplace spaces with undercores in tags
  Introducing Frost Mobile
  Introducing Frost

author	Simon L'nu <simon.lnu@gmail.com>
	Thu, 26 Jul 2012 02:28:16 +0000 (22:28 -0400)
committer	Simon L'nu <simon.lnu@gmail.com>
	Thu, 26 Jul 2012 02:28:16 +0000 (22:28 -0400)
commit	d0724812eef9c97218f51630e876be098fe15210
tree	0c318361c0fa1d7f8918a7dcf5b6c9a975ad4309	tree \| snapshot
parent	794ae669cefa8234da08718e81a5872832b79259	commit \| diff
parent	2e5c970cb122d6ef84f87bf6e56c00e18e22b938	commit \| diff