]> git.mxchange.org Git - friendica-addons.git/commitdiff
projects / friendica-addons.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 916d609 c76f706)
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
authorSimon L'nu <simon.lnu@gmail.com>
Tue, 28 Feb 2012 10:29:06 +0000 (05:29 -0500)
committerSimon L'nu <simon.lnu@gmail.com>
Tue, 28 Feb 2012 10:29:06 +0000 (05:29 -0500)
* remotes/upstream/master:
  add ljpost.css
  added the tarball
  added livejournal plugin
  minor fixes

* master:


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