]> cat aescling's git repositories - mastodon.git/commitdiff
cat aescling's git repositories / mastodon.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 3a4b596 5fef55c)
Merge branch 'master' of https://github.com/ineffyble/mastodon into ineffyble-master
authorEugen Rochko <eugen@zeonfederated.com>
Sat, 21 Jan 2017 21:15:22 +0000 (22:15 +0100)
committerEugen Rochko <eugen@zeonfederated.com>
Sat, 21 Jan 2017 21:15:22 +0000 (22:15 +0100)
1  2 
config/routes.rb patch | diff1 | diff2 | blob | history

diff --cc config/routes.rb
Simple merge
source code fur Kibicat Mastodon