Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
25 commits
Select commit Hold shift + click to select a range
3fb02b1
add eggs benny feb recipe
katherinmelo Jan 17, 2020
a76954e
Merge pull request #1 from katherinmelo/eggs-benny-feb
katherinmelo Jan 17, 2020
419e191
bump version to 1.0.1
katherinmelo Jan 17, 2020
7e753c6
remove email from app
katherinmelo Jan 17, 2020
d80ba46
Merge pull request #2 from katherinmelo/remove-emails
katherinmelo Jan 17, 2020
917e141
Merge pull request #3 from katherinmelo/remove-emails
katherinmelo Jan 18, 2020
8bbf586
Merge pull request #4 from katherinmelo/hotfix-1.0.1
katherinmelo Jan 18, 2020
001a318
Merge branch 'hotfix-1.0.1' into develop
katherinmelo Jan 18, 2020
4e376f8
bump version to 1.1
katherinmelo Jan 18, 2020
ddbc9f4
changes
katherinmelo Jan 18, 2020
2d2daa1
remove lemon
katherinmelo Jan 18, 2020
1ecffe6
Merge pull request #5 from katherinmelo/remove-john-lemon
katherinmelo Jan 18, 2020
72e750a
Merge branch 'release-1.1'
katherinmelo Jan 18, 2020
b76ff7a
This is my change
Edisson-S Sep 18, 2020
0c7afc3
Merge pull request #7 from katherinmelo/miKat
Edisson-S Sep 18, 2020
25008ca
este es mi cambio ed
Sep 18, 2020
402c510
mateos work
Masanar Sep 18, 2020
26fc005
Merge pull request #8 from katherinmelo/miED
katherinmelo Sep 18, 2020
c1158b2
cambié el version
Edisson-S Sep 18, 2020
6f417b8
cambié el readme
Edisson-S Sep 18, 2020
0bfd8c6
Merge pull request #9 from katherinmelo/miKat
Edisson-S Sep 18, 2020
b555e7f
te quiero ed
Sep 18, 2020
c2fa91b
Merge pull request #10 from katherinmelo/miED
katherinmelo Sep 18, 2020
a6cf8dd
mateos working
Masanar Sep 18, 2020
bf28811
Merge branch 'master' into mateo
Masanar Sep 18, 2020
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 5 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,10 @@

An exercise for learning the [git-flow branching model](http://nvie.com/posts/a-successful-git-branching-model/). This exercise will walk your team through a full release cycle for an example application.

## Background

The print magazine _Flavor_ has asked your firm to build and maintain an app so they can share recipes with their hungry audience.
gtegfcduiw ejopfkwòygvujbgkj
The jfeepifwerw iger jgreogkfwprint magazine _Flavor_ haswfhevbfjenhkfcw asked your frfgvrfgergreirm to build and maintain an app so they can share recipes with their hungry audience.


The typical development cycle for the project is as follows:

Expand All @@ -25,11 +26,11 @@ Please leave this repository open in a browser tab so that you can follow along
### Project Structure
* Application code can be found in the [`/app/`](/app/) folder.
* The application contains a file named [`VERSION`](/app/VERSION) that contains the major, minor, and patch numbers for the project.
* Source files are written in markdown and can be identified by the `.md` file extension.
* Source files are written in markdown and can be identifieASDASDASDd by the `.md` file extension.

## Next

Next we will walk through the process of creating a GitHub Fork and local clone of this repository.
Next we will walk through the pasdasdrocess of creating a GitHub Fork and local clone of this repository. hello

[Go](/walkthrough/1-setup.md)

Expand Down
3 changes: 2 additions & 1 deletion app/VERSION
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
major=1
minor=0
minor=1
patch=0
ASDASD
17 changes: 9 additions & 8 deletions app/index.md
Original file line number Diff line number Diff line change
@@ -1,23 +1,24 @@
# _Flavor_ Magazine

Welcome to _Flavor_, the only place on the planet where your taste buds won't be disappointed!

hellooo


## Picks of the Month

### [Cuba Pudding Jr.](writer/cuba-pudding-jr.md) | cubapud@flavor.magazine
### [Cuba Pudding Jr.](writer/cuba-pudding-jr.md) |

[Grilled Peach Salad](recipe/jan/grilled-peach-salad.md)

### [Eggs Benny](writer/eggs-benny.md) | englishmuffin@flavor.magazine
### [Eggs Benny](writer/eggs-benny.md) |

[Vanilla Panna Cotta](recipe/jan/vanilla-panna-cotta.md)
[Asparagus with Cranberries](recipe/feb/Asparagus with Cranberries.md)

### [John Lemon](writer/john-lemon.md) | zestmaster@flavor.magazine
### [Madame Croque](writer/madame-croque.md) |

[Homemade Sausages](recipe/jan/homemade-sausages.md)
[Chocolate Soup](recipe/jan/chocolate-soup.md)

### [Madame Croque](writer/madame-croque.md) | mmecroque@flavor.magazine

[Chocolate Soup](recipe/jan/chocolate-soup.md)


asdasd
27 changes: 27 additions & 0 deletions app/recipe/feb/Asparagus with Cranberries.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
# Asparagus with Cranberries and Pine Nuts

This is a quick, easy way to saute asparagus. The dish has a light flavor and makes a great accompaniment to Italian meals. I make this year-round, but we especially enjoy it on Thanksgiving.

Source: https://www.allrecipes.com/recipe/174361/asparagus-with-cranberries-and-pine-nuts/

## Ingredients

- 400 g brioche loaf (or rolls)
- 150 g salted butter, melted
- 100 g soft brown sugar
- 1 tsp ground cinnamon
- 500 ml milk
- 500 ml double cream
- 400 g dark chocolate (strong cocoa %)
- 1 tbsp cornflour
- 1 tbsp cocoa powder
- 2 egg yolks
- 50 ml milk
- 1 tbsp cocoa nibs (optional)
- 50 ml double cream (to drizzle)
- 12 mint leaves (garnish)

# Instructions

1. Break off or trim the woody ends from the asparagus and discard. Set the spears aside.
2. Heat the olive oil in a skillet over medium heat. Stir in the pine nuts, cranberries, and salt. Cook and stir until the pine nuts start to look translucent, 5 to 6 minutes. Add the asparagus spears and cook, adding a little more olive oil if needed, until stalks are bright green and tender, about 5 to 8 minutes. Serve on a platter with the cranberries and nuts spooned over the top of the asparagus.
1 change: 1 addition & 0 deletions app/writer/eggs-benny.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,3 +5,4 @@
Recipe Picks:

- January: [Vanilla Panna Cotta](../recipe/jan/vanilla-panna-cotta.md)
- February: [Asparagus with Cranberries](../recipe/feb/Asparagus with Cranberries.md)
7 changes: 0 additions & 7 deletions app/writer/john-lemon.md

This file was deleted.

28 changes: 28 additions & 0 deletions app/writer/vanilla-panna-cotta.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
# Vanilla Panna Cotta

Got someone you really need to impress but don't want to spend all night in the kitchen? This dessert can all be done the day before, but is sure to blow their socks off!

Source: https://sortedfood.com/recipe/971

## Ingredients

- 3 gelatine leaves
- 400 ml double cream
- 1 lemon
- 1 vanilla pod
- 75 g icing sugar
- 1 handful fresh strawberries
- 1 handful fresh raspberries
- 1 handful fresh blueberries
- 1 glass rose wine
- 1 tbsp sugar
- 1 sprig fresh mint

## Instructions

1. Soak the gelatine leaves in a little cold water to soften. Zest the lemon and put into a pan. Half the vanilla pod and scrape out the seeds. Put both the pod and seeds into the pan with the zest.
2. Pour ¾ of the cream into a pan and bring to the boil. Squeeze all excess water from the gelatine and whisk through the hot cream. Leave to cool.
3. Whisk what is left of the cream and fold through the slightly cooled cream. Divide into 4 individual jelly moulds, ramekins or espresso cups and put into the fridge to set overnight.
4. Cut up all the berries and leave to soak in the rose with a spoonful of sugar overnight.
5. Dunk the moulds into hot water to loosen the panna cottas and turn out onto a plate.
6. Scatter with macerated berries and garnish with a sprig of mint. Serves 4
1 change: 1 addition & 0 deletions thisismytxt.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Hola mundo