]> git.mxchange.org Git - friendica.git/commit
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
authorSimon L'nu <simon.lnu@gmail.com>
Sun, 13 May 2012 22:50:04 +0000 (18:50 -0400)
committerSimon L'nu <simon.lnu@gmail.com>
Sun, 13 May 2012 22:50:04 +0000 (18:50 -0400)
commit39c042f4ea33abd77d6431c531b6eae72f2d7994
tree91cef4041bbdfbc1fe08ffb08c52661d70c59f94
parentf267a283b46edaf389e99ef3ea4341a5a0496aab
parent303856ce01983feec95539892a908b5d5a88f866
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'

* remotes/upstream/master:
  diabook-theme: small fixes
  rename get_language() to get_browser_language()
  slackr drop shadows
  language detection library
  rev update

* master: