]> git.mxchange.org Git - friendica-addons.git/commit
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
authorSimon L'nu <simon.lnu@gmail.com>
Sun, 25 Mar 2012 05:06:15 +0000 (01:06 -0400)
committerSimon L'nu <simon.lnu@gmail.com>
Sun, 25 Mar 2012 05:06:15 +0000 (01:06 -0400)
commit0f87f3400f662553dacc9a095cd8c7fec3a9a3b2
tree96a7242d46db5da78f3b07704755b3e4f1c26117
parent1a2c142a9e3ce3f8cbcd675739525c3ccc6c2907
parent09f36c856a907183f3f24acb4be4d269a88f01c3
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'

* remotes/upstream/master:
  Few more smileys
  tweaks to page plugin
  deleted:    smiley_pack/.smiley_pack.php.kate-swp
  modified:   .gitignore Commented out bits that don't seem relevant to friendica-addons.  Somebody should do this properly, but I'm not confident.
  new file:   .gitignore .gitignore file
  a few new smilieys, plus case-insensitivty for a couple of core smileys

* master: