]> git.mxchange.org Git - friendica.git/commitdiff
projects / friendica.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: f267a28 303856c)
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)
* remotes/upstream/master:
  diabook-theme: small fixes
  rename get_language() to get_browser_language()
  slackr drop shadows
  language detection library
  rev update

* master:


Trivial merge
Unnamed repository; edit this file 'description' to name the repository.