You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

Alex S fa8483cb80 Merging develop into feature/770-add-emoji-tags ... Conflict test/web/twitter_api/util_controller_test.exs		6 years ago
..
representers	Remove ActivityRepresenter	6 years ago
views	change `Repo.get(Activity, id)` => `Activity.get_by_id(id)` in tests	6 years ago
twitter_api_controller_test.exs	replace `Repo.get_by(User, nickname: nickname)` with `User.get_by_nickname(nickname)` in tests	6 years ago
twitter_api_test.exs	replace `Repo.get_by(User, nickname: nickname)` with `User.get_by_nickname(nickname)` in tests	6 years ago
util_controller_test.exs	Merging develop into feature/770-add-emoji-tags	6 years ago