Alex S fa8483cb80 Merging develop into feature/770-add-emoji-tags ... Conflict test/web/twitter_api/util_controller_test.exs		2019-04-02 20:39:52 +07:00
..
representers
views	change Repo.get(Activity, id) => Activity.get_by_id(id) in tests	2019-04-02 17:08:03 +07:00
twitter_api_controller_test.exs	replace Repo.get_by(User, nickname: nickname) with User.get_by_nickname(nickname) in tests	2019-04-02 17:58:32 +07:00
twitter_api_test.exs	replace Repo.get_by(User, nickname: nickname) with User.get_by_nickname(nickname) in tests	2019-04-02 17:58:32 +07:00
util_controller_test.exs	Merging develop into feature/770-add-emoji-tags	2019-04-02 20:39:52 +07:00