]> git.mxchange.org Git - friendica-addons.git/commitdiff
projects / friendica-addons.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: d978654 20ab0c6)
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
authorSimon L'nu <simon.lnu@gmail.com>
Mon, 19 Mar 2012 01:17:42 +0000 (21:17 -0400)
committerSimon L'nu <simon.lnu@gmail.com>
Mon, 19 Mar 2012 01:17:42 +0000 (21:17 -0400)
* remotes/upstream/master:
  not yet linked adult_smiles
  pkg update
  deleted:    smiley_pack/smiley_pack.php~
  First set of smilies for smiley_pack

* master:


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