]> git.mxchange.org Git - friendica.git/commit
projects / friendica.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 5b407b5) | patch
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
authorSimon L'nu <simon.lnu@gmail.com>
Tue, 17 Apr 2012 19:36:45 +0000 (15:36 -0400)
committerSimon L'nu <simon.lnu@gmail.com>
Tue, 17 Apr 2012 19:36:45 +0000 (15:36 -0400)
commit74b237d46d9472a125315e35d77bf2d0fdabaa7e
treea0d99585db56d471881176fec43e9b8aa90f07a9tree | snapshot
parent5b407b5ee7268cce3a3dbb659a5b33dc62ab93d7commit | diff
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'

* remotes/upstream/master:
  diabook-themes: theme-settings: "wide"-option and new screenshots

* master:
Unnamed repository; edit this file 'description' to name the repository.