https://reisub.nsupdate.info/git / friendica.git / .git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 9fba504 748d0e5)
Merge develop into 1901_autocomplete
authorrabuzarus <trebor@central-unit>
Sat, 30 Jan 2016 15:57:54 +0000 (16:57 +0100)
committerrabuzarus <trebor@central-unit>
Sat, 30 Jan 2016 15:57:54 +0000 (16:57 +0100)
1  2 
js/main.js patch | diff1 | diff2 | blob | history
view/theme/vier/style.css patch | diff1 | diff2 | blob | history

diff --cc js/main.js
Simple merge
diff --cc view/theme/vier/style.css
Simple merge
mirror https://github.com/friendica/friendica.git