]> git.mxchange.org Git - friendica.git/commit
projects / friendica.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: bc69a95 f931d5c)
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
authorSimon L'nu <simon.lnu@gmail.com>
Sat, 7 Apr 2012 18:47:02 +0000 (14:47 -0400)
committerSimon L'nu <simon.lnu@gmail.com>
Sat, 7 Apr 2012 18:47:02 +0000 (14:47 -0400)
commitcee36087470acbc4aeff121ab91cd337737dcc67
treea093294b2b3ee2f99c0dc5b95d5844bf9817eafatree | snapshot
parentbc69a957dc875b699240827cb4af2691f8a8fcd6commit | diff
parentf931d5c918fa3146afa851a4f32c90a35ee1c85bcommit | diff
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'

* remotes/upstream/master:
  diabook-themes: small fix
  changelog 1.014 : image-rezise via jquery-plugin in stream comments under uploaded pictues add Diabook's version-number in head-section
  ignore utf8 offset error for unit tests
  had arg order backwards
  try assertContains
  tag tests cont.
  fix autonamenegativelength test
  some work on tests

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