friendica/dir
6
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge branch 'master', remote-tracking branch 'remotes/upstream/master'

Browse source 
* remotes/upstream/master: (22 commits)
  diabook-themes: bugfix (sry, necessary)
  diabook-themes: small bug/css-fixes ---> ver. 1.019
  diabook-themes: bug-fixes
  diabook-themes: minor bugfixes
  turn on comment edit
  propagate edited comments
  edited comments weren't being relayed
  rev update
  diabook-themes: css-fixes
  open contact edit in same window
  where did this "lang" string come from and why?
  function name typo
  track requested profile error msg
  DBA: Reverting back to original source
  DBA: Nothing really done ..
  DBA: Deactivation of the mysqli-class for testing purposes.
  API: Improved the timeline. Several (disabled) tests with caching of photos.
  html2plain: changed behaviour for the "hr" element.
  API: Tweetdeck is now working
  API: Added Public Timeline
  ...

* master:
This commit is contained in:
Simon L'nu 2012-04-16 22:58:28 -04:00
parent f08844a8a5
commit 4e967fc79f
Show stats Download patch file Download diff file Expand all files Collapse all files

Diff content is not available