move merged request

Merge branch 'master' of s432759/CatOrNot into master
Branch cleanup
2019-01-03 22:18:57 +01:00 · 2019-01-03 21:13:47 +00:00 · 2019-01-02 14:41:53 +01:00 · 2019-01-02 13:26:04 +00:00 · 2019-01-02 13:20:32 +00:00 · 2018-12-28 22:24:23 +00:00
2 changed files with 8 additions and 0 deletions
--- a/README.md
+++ b/README.md
@ -1,4 +1,5 @@
 # Cat or Not - artifact repository
+# First prototype
 ### Monday 15:30 group

 ## How to use this repository?
@ -6,5 +7,12 @@ To send an artifact for evaluation, create a pull request with it. Accepted arti

 In case of an artifact not passing a quality control, person responsible will be contacted with informations about necessary changes.

+Documentation is located in the **docs** branch.
+
+Application prototype is located in the **app** branch.
+
 ## Version Control Document
 It is located in a [repository's wiki](https://git.wmi.amu.edu.pl/s434650/CatOrNot/wiki/Version+History+Document). It will be updated with each accepted artifact.
+
+## Heroku application
+https://lit-wildwood-10245.herokuapp.com/
--- a/Software-Requirements-Specification.docx
+++ b/Software-Requirements-Specification.docx
Author	SHA1	Message	Date
Miccowhy	2b44aee238	move merged request	2019-01-03 22:18:57 +01:00
Mikołaj Aleksandrzak	21e04c9f18	Merge branch 'master' of s432759/CatOrNot into master	2019-01-03 21:13:47 +00:00
Mikołaj Aleksandrzak	9a1659292c	Branch cleanup	2019-01-02 14:41:53 +01:00
Mikołaj Aleksandrzak	f1ad502f13	Merge branch 'master' of s434603/CatOrNot into master	2019-01-02 13:26:04 +00:00
Ivan Vasyliev	04df0bed03	Завантажувати файли до ''	2019-01-02 13:20:32 +00:00
Weronika Olejniczak	b7c8a2f4d1	use case specification	2018-12-28 22:24:23 +00:00
Weronika Olejniczak	9c9a9ce770	scope v2	2018-12-28 22:23:30 +00:00
Miccowhy	2e8abef8a5	cleanup of a master branch	2018-12-28 14:41:52 +01:00
Miccowhy	83134656a9	update README	2018-12-28 14:34:31 +01:00
Mikołaj Aleksandrzak	fdb66a042b	Merge branch 'master' of s434599/CatOrNot into master	2018-12-28 13:14:27 +00:00
Miccowhy	8cfa2f85ae	update to srs	2018-12-28 14:09:49 +01:00
Angelika Lach	6c1095a9f9	Prześlij pliki do '' test plan	2018-12-27 21:13:24 +00:00
Weronika Olejniczak	db7e5971f7	Upload files to ''	2018-12-24 12:56:13 +00:00
Mikołaj Aleksandrzak	35f161fc4d	Merge branch 'master' of s434596/CatOrNot into master	2018-12-11 15:33:29 +00:00
Mikołaj Aleksandrzak	7eb8515b6d	Merge branch 'doc' of s434603/CatOrNot into master	2018-12-11 15:33:17 +00:00
c00lerxo	8baf88ca94	Remove redundant README	2018-12-11 13:05:47 +01:00
c00lerxo	63feb5c1fd	Change README	2018-12-11 13:04:51 +01:00
c00lerxo	3d44adfc16	Merge branch 'master' of https://git.wmi.amu.edu.pl/s434596/CatOrNot	2018-12-11 13:03:40 +01:00
c00lerxo	0f51b7975a	Remove redundant directory	2018-12-11 13:02:46 +01:00
c00lerxo	11b478aa97	Add README	2018-12-11 13:01:20 +01:00
c00lerxo	b34d2361bc	Fix Procfile	2018-12-11 12:41:16 +01:00
c00lerxo	db23e91400	Add Gunicorn server	2018-12-11 12:35:20 +01:00
c00lerxo	654908ed6e	Add Procfile	2018-12-11 12:24:36 +01:00
c00lerxo	49db71a5a4	Fix requirements.txt	2018-12-11 12:21:41 +01:00
c00lerxo	554bb0bbd5	Add requirements.txt	2018-12-11 12:18:25 +01:00
c00lerxo	28458403bb	Prototype app	2018-12-11 00:32:28 +01:00